From ced63024ab706f09aaeaa6186bb4ccde50236e7a Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 30 Mar 2022 19:07:36 +0000 Subject: [PATCH 001/103] add ClassComposer to generate spring bean. --- .../SpringAutoConfigClassComposer.java | 202 +++++++++++++++++ .../SpringAutoConfigClassComposerTest.java | 208 ++++++++++++++++++ 2 files changed, 410 insertions(+) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java create mode 100644 src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java new file mode 100644 index 0000000000..55bc264b19 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -0,0 +1,202 @@ +// 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; + +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.core.BackgroundResourceAggregation; +import com.google.api.gax.grpc.GrpcCallSettings; +import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.rpc.BidiStreamingCallable; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientStreamingCallable; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.ServerStreamingCallable; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.BlockComment; +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.ConcreteReference; +import com.google.api.generator.engine.ast.MethodDefinition; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.VaporReference; +import com.google.api.generator.gapic.composer.common.ClassComposer; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicClass.Kind; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.Service; +import com.google.common.base.CaseFormat; +import com.google.longrunning.Operation; +import com.google.longrunning.stub.GrpcOperationsStub; +import io.grpc.MethodDescriptor; +import io.grpc.protobuf.ProtoUtils; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import javax.annotation.Generated; + +public class SpringAutoConfigClassComposer implements ClassComposer { + private static final String CLASS_NAME_PATTERN = "%sDemo"; + private static final String OPERATIONS_STUB_MEMBER_NAME = "operationsStub"; + private static final String BACKGROUND_RESOURCES_MEMBER_NAME = "backgroundResources"; + + private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); + + private static final Map staticTypes = createStaticTypes(); + + private SpringAutoConfigClassComposer() {} + + public static SpringAutoConfigClassComposer instance() { + return INSTANCE; + } + + @Override + public GapicClass generate(GapicContext ignore, Service service) { + String packageName = service.pakkage() + ".demo"; + Map types = createDynamicTypes(service, packageName); + String className = getThisClassName(service.name()); + GapicClass.Kind kind = Kind.MAIN; + + // header -- not used, add later + List fileHeader = + Arrays.asList(CommentStatement.withComment(BlockComment.withComment("Apache License"))); + + ClassDefinition classDef = + ClassDefinition.builder() + // .setFileHeader(fileHeader) + .setPackageString(packageName) + .setName(className) + .setScope(ScopeNode.PUBLIC) + .setMethods(Arrays.asList(createBeanMethod(service))) + .setAnnotations(createClassAnnotations()) + .build(); + return GapicClass.create(kind, classDef); + } + + private static List createClassAnnotations() { + TypeNode conditionalOnPropertyType = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnProperty") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + // AnnotationNode description only accepts String for now. need to extend to params + AnnotationNode conditionalOnPropertyNode = + AnnotationNode.builder() + .setType(conditionalOnPropertyType) + .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") + .build(); + return Arrays.asList( + AnnotationNode.builder() + .setType(staticTypes.get("Generated")) + .setDescription("by gapic-generator-java") + .build(), + conditionalOnPropertyNode); + } + + private static MethodDefinition createBeanMethod(Service service) { + // annotation types + TypeNode beanAnnotationType = + TypeNode.withReference( + VaporReference.builder() + .setName("Bean") + .setPakkage("org.springframework.context.annotation") + .build()); + TypeNode conditionalOnMissingBeanType = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnMissingBean") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + // client type + TypeNode clientType = + TypeNode.withReference( + VaporReference.builder() + .setName(service.name() + "Client") + .setPakkage(service.pakkage()) + .build()); + // build expressions + MethodInvocationExpr lhsExpr = + MethodInvocationExpr.builder() + .setMethodName("create") + .setStaticReferenceType(clientType) + .setReturnType(clientType) + .build(); + + String methodName = + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; + return MethodDefinition.builder() + .setName(methodName) + .setScope(ScopeNode.PUBLIC) + .setReturnType(clientType) + .setAnnotations( + Arrays.asList( + AnnotationNode.withType(beanAnnotationType), + AnnotationNode.withType(conditionalOnMissingBeanType))) + .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + .setReturnExpr(lhsExpr) + .build(); + } + + private static Map createStaticTypes() { + List concreteClazzes = + Arrays.asList( + BackgroundResource.class, + BackgroundResourceAggregation.class, + BidiStreamingCallable.class, + ClientContext.class, + ClientStreamingCallable.class, + Generated.class, + GrpcCallSettings.class, + GrpcOperationsStub.class, + GrpcStubCallableFactory.class, + InterruptedException.class, + IOException.class, + MethodDescriptor.class, + Operation.class, + OperationCallable.class, + ProtoUtils.class, + ServerStreamingCallable.class, + TimeUnit.class, + UnaryCallable.class); + return concreteClazzes.stream() + .collect( + Collectors.toMap( + c -> c.getSimpleName(), + c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); + } + + private static Map createDynamicTypes(Service service, String stubPakkage) { + return Arrays.asList(CLASS_NAME_PATTERN).stream() + .collect( + Collectors.toMap( + p -> String.format(p, service.name()), + p -> + TypeNode.withReference( + VaporReference.builder() + .setName(String.format(p, service.name())) + .setPakkage(stubPakkage) + .build()))); + } + + private static String getThisClassName(String serviceName) { + return String.format(CLASS_NAME_PATTERN, serviceName); + } +} diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java new file mode 100644 index 0000000000..90b825f2e9 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -0,0 +1,208 @@ +// 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; + +import static junit.framework.Assert.assertEquals; + +import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.BlockComment; +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.MethodDefinition; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.VaporReference; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; +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.Message; +import com.google.api.generator.gapic.model.ResourceName; +import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.model.Transport; +import com.google.api.generator.gapic.protoparser.Parser; +import com.google.protobuf.Descriptors.FileDescriptor; +import com.google.protobuf.Descriptors.ServiceDescriptor; +import com.google.showcase.v1beta1.EchoOuterClass; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import org.junit.Before; +import org.junit.Test; + +public class SpringAutoConfigClassComposerTest { + private ServiceDescriptor echoService; + private FileDescriptor echoFileDescriptor; + + @Before + public void setUp() { + echoFileDescriptor = EchoOuterClass.getDescriptor(); + echoService = echoFileDescriptor.getServices().get(0); + assertEquals(echoService.getName(), "Echo"); + } + + @Test + public void writeMethodDefinition_constructor() { + // ignore: practice AST grammar here. + JavaWriterVisitor writerVisitor = new JavaWriterVisitor(); + + // header + List fileHeader = + Arrays.asList(CommentStatement.withComment(BlockComment.withComment("Apache License"))); + // annotation types + TypeNode beanAnnotationType = + TypeNode.withReference( + VaporReference.builder() + .setName("Bean") + .setPakkage("org.springframework.context.annotation") + .build()); + TypeNode conditionalOnMissingBeanType = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnMissingBean") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + TypeNode conditionalOnPropertyType = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnProperty") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + // AnnotationNode description only accepts String for now. need to extend to params + AnnotationNode conditionalOnPropertyNode = + AnnotationNode.builder() + .setType(conditionalOnPropertyType) + .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") + .build(); + // client type + TypeNode clientType = + TypeNode.withReference( + VaporReference.builder() + .setName("LanguageServiceClient") + .setPakkage("com.google.cloud.language.v1") + .build()); + // build expressions + MethodInvocationExpr lhsExpr = + MethodInvocationExpr.builder() + .setMethodName("create") + .setStaticReferenceType(clientType) + .setReturnType(clientType) + .build(); + + VariableExpr variableExpr = + VariableExpr.builder() + .setVariable(Variable.builder().setName("client").setType(clientType).build()) + .setIsDecl(true) + .build(); + + // VariableExpr returnArg = VariableExpr.builder() + // .setVariable(createVariable("client", clientType)) + // .build(); + + MethodInvocationExpr expr = + MethodInvocationExpr.builder() + .setMethodName("languageServiceClientCreate") + .setReturnType(clientType) + .build(); + + // AssignmentExpr assignmentExpr = AssignmentExpr.builder().setVariableExpr(variableExpr) + // .setValueExpr(expr).build(); + + MethodDefinition beanMethod = + MethodDefinition.builder() + .setName("languageServiceClient") + .setScope(ScopeNode.PUBLIC) + .setReturnType(clientType) + .setAnnotations( + Arrays.asList( + AnnotationNode.withType(beanAnnotationType), + AnnotationNode.withType(conditionalOnMissingBeanType))) + .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + .setReturnExpr(lhsExpr) + // .setBody( + // Arrays.asList(ExprStatement.withExpr(assignmentExpr))) + .build(); + + ClassDefinition classDef = + ClassDefinition.builder() + .setFileHeader(fileHeader) + .setPackageString("com.google.example.library.v1") + .setName("LibraryServiceStub") + .setScope(ScopeNode.PUBLIC) + .setMethods(Arrays.asList(beanMethod)) + .setAnnotations(Arrays.asList(conditionalOnPropertyNode)) + .build(); + + classDef.accept(writerVisitor); + System.out.println("HERE STARTS OUTPUT: "); + System.out.println(writerVisitor.write()); + // Assert.assertEquals("public LibrarySettings() {\n}\n\n", writerVisitor.write()); + } + + @Test + public void generateAutoConfigClasses() { + Map messageTypes = Parser.parseMessages(echoFileDescriptor); + + Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); + Set outputResourceNames = new HashSet<>(); + + List services = + Parser.parseService( + echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + + GapicContext context = + GapicContext.builder() + .setMessages(messageTypes) + .setResourceNames(resourceNames) + .setServices(services) + .setHelperResourceNames(outputResourceNames) + .setTransport(Transport.GRPC) + .build(); + + Service echoProtoService = services.get(0); + GapicClass clazz = SpringAutoConfigClassComposer.instance().generate(context, echoProtoService); + + JavaWriterVisitor visitor = new JavaWriterVisitor(); + clazz.classDefinition().accept(visitor); + assertEquals(EXPECTED_CLASS_STRING, visitor.write()); + } + + private static final String EXPECTED_CLASS_STRING = + "package com.google.showcase.v1beta1.demo;\n" + + "\n" + + "import com.google.showcase.v1beta1.EchoClient;\n" + + "import java.io.IOException;\n" + + "import javax.annotation.Generated;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + + "import org.springframework.context.annotation.Bean;\n" + + "\n" + + "@Generated(\"by gapic-generator-java\")\n" + + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + + "public class EchoDemo {\n" + + "\n" + + " @Bean\n" + + " @ConditionalOnMissingBean\n" + + " public EchoClient echoClient() throws IOException {\n" + + " return EchoClient.create();\n" + + " }\n" + + "}\n"; +} From be4814a85adfc4a35b079453065355e03cb3efa7 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 30 Mar 2022 19:09:32 +0000 Subject: [PATCH 002/103] add composer on top of class composer. --- .../gapic/composer/SpringComposer.java | 60 +++++++++ .../gapic/composer/SpringComposerTest.java | 123 ++++++++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java create mode 100644 src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java new file mode 100644 index 0000000000..dfedf53074 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java @@ -0,0 +1,60 @@ +// 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; + +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.gapic.composer.comment.CommentComposer; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.Transport; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class SpringComposer { + public static List composeServiceAutoConfigClasses(GapicContext context) { + List clazzes = new ArrayList<>(); + clazzes.addAll(generateClientAutoConfig(context)); + return addApacheLicense(clazzes); + } + + public static List generateClientAutoConfig(GapicContext context) { + List clazzes = new ArrayList<>(); + context + .services() + .forEach( + s -> { + if (context.transport() == Transport.GRPC) { + clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s)); + } + }); + return clazzes; + } + + protected static List addApacheLicense(List gapicClassList) { + return gapicClassList.stream() + .map( + gapicClass -> { + ClassDefinition classWithHeader = + gapicClass + .classDefinition() + .toBuilder() + .setFileHeader(CommentComposer.APACHE_LICENSE_COMMENT) + .build(); + return GapicClass.create(gapicClass.kind(), classWithHeader); + }) + .collect(Collectors.toList()); + } +} diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java new file mode 100644 index 0000000000..b087d2281e --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java @@ -0,0 +1,123 @@ +// 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; + +import com.google.api.generator.engine.ast.ClassDefinition; +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.Message; +import com.google.api.generator.gapic.model.ResourceName; +import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.model.Transport; +import com.google.api.generator.gapic.protoparser.Parser; +import com.google.protobuf.Descriptors.FileDescriptor; +import com.google.protobuf.Descriptors.ServiceDescriptor; +import com.google.showcase.v1beta1.EchoOuterClass; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class SpringComposerTest { + private GapicContext context; + + private String EXPECTED_CODE = + "/*\n" + + " * Copyright 2022 Google LLC\n" + + " *\n" + + " * Licensed under the Apache License, Version 2.0 (the \"License\");\n" + + " * you may not use this file except in compliance with the License.\n" + + " * You may obtain a copy of the License at\n" + + " *\n" + + " * https://www.apache.org/licenses/LICENSE-2.0\n" + + " *\n" + + " * Unless required by applicable law or agreed to in writing, software\n" + + " * distributed under the License is distributed on an \"AS IS\" BASIS,\n" + + " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" + + " * See the License for the specific language governing permissions and\n" + + " * limitations under the License.\n" + + " */\n" + + "\n" + + "package com.google.showcase.v1beta1.demo;\n" + + "\n" + + "import com.google.showcase.v1beta1.EchoClient;\n" + + "import java.io.IOException;\n" + + "import javax.annotation.Generated;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + + "import org.springframework.context.annotation.Bean;\n" + + "\n" + + "@Generated(\"by gapic-generator-java\")\n" + + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + + "public class EchoDemo {\n" + + "\n" + + " @Bean\n" + + " @ConditionalOnMissingBean\n" + + " public EchoClient echoClient() throws IOException {\n" + + " return EchoClient.create();\n" + + " }\n" + + "}\n"; + + @Before + public void setUp() { + + FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor(); + ServiceDescriptor echoService = echoFileDescriptor.getServices().get(0); + Assert.assertEquals(echoService.getName(), "Echo"); + + Map messageTypes = Parser.parseMessages(echoFileDescriptor); + + Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); + Set outputResourceNames = new HashSet<>(); + + List services = + Parser.parseService( + echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + + context = + GapicContext.builder() + .setMessages(messageTypes) + .setResourceNames(resourceNames) + .setServices(services) + .setHelperResourceNames(outputResourceNames) + .setTransport(Transport.GRPC) + .build(); + } + + @Test + public void spring_composer_test() { + + List gapicClasses = SpringComposer.composeServiceAutoConfigClasses(context); + + // write to verify result for now + StringBuilder codeForAllClasses = new StringBuilder(); + JavaWriterVisitor codeWriter = new JavaWriterVisitor(); + for (GapicClass gapicClazz : gapicClasses) { + ClassDefinition clazz = gapicClazz.classDefinition(); + + clazz.accept(codeWriter); + String code = codeWriter.write(); + codeForAllClasses.append(code); + codeWriter.clear(); + } + + Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); + } +} From 96288f2175942b8db389b370c807b648cfd4e8f3 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 30 Mar 2022 19:59:38 +0000 Subject: [PATCH 003/103] add to generator and adding comments. --- .../java/com/google/api/generator/gapic/Generator.java | 10 ++++++++++ .../gapic/composer/SpringAutoConfigClassComposer.java | 5 ++++- .../api/generator/gapic/composer/SpringComposer.java | 3 ++- .../composer/SpringAutoConfigClassComposerTest.java | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/Generator.java b/src/main/java/com/google/api/generator/gapic/Generator.java index 30658ff6a5..abf633767d 100644 --- a/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/src/main/java/com/google/api/generator/gapic/Generator.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic; import com.google.api.generator.gapic.composer.Composer; +import com.google.api.generator.gapic.composer.SpringComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; @@ -32,4 +33,13 @@ public static CodeGeneratorResponse generateGapic(CodeGeneratorRequest request) String outputFilename = "temp-codegen.srcjar"; return Writer.write(context, clazzes, packageInfo, outputFilename); } + + public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) { + // not tested. next step: create a wrapper class to call from new bazel build rule. + GapicContext context = Parser.parse(request); + List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); + GapicPackageInfo packageInfo = Composer.composePackageInfo(context); + String outputFilename = "temp-codegen-spring.srcjar"; + return Writer.write(context, clazzes, packageInfo, outputFilename); + } } diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 55bc264b19..94e39c6328 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -97,7 +97,7 @@ private static List createClassAnnotations() { .setName("ConditionalOnProperty") .setPakkage("org.springframework.boot.autoconfigure.condition") .build()); - // AnnotationNode description only accepts String for now. need to extend to params + // TODO: AnnotationNode description only accepts String for now. need to extend to params AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() .setType(conditionalOnPropertyType) @@ -135,6 +135,9 @@ private static MethodDefinition createBeanMethod(Service service) { // build expressions MethodInvocationExpr lhsExpr = MethodInvocationExpr.builder() + // TODO: might need to use newBuilder().build() if options needed. + // read more in client composer: + // src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java#L277-L292 .setMethodName("create") .setStaticReferenceType(clientType) .setReturnType(clientType) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java index dfedf53074..48ed967373 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java @@ -27,10 +27,11 @@ public class SpringComposer { public static List composeServiceAutoConfigClasses(GapicContext context) { List clazzes = new ArrayList<>(); clazzes.addAll(generateClientAutoConfig(context)); + // TODO: from context, explore if any property settings needed. return addApacheLicense(clazzes); } - public static List generateClientAutoConfig(GapicContext context) { + protected static List generateClientAutoConfig(GapicContext context) { List clazzes = new ArrayList<>(); context .services() diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 90b825f2e9..c4cb869914 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -61,7 +61,7 @@ public void setUp() { @Test public void writeMethodDefinition_constructor() { - // ignore: practice AST grammar here. + // To be deleted, please ignore: practice AST grammar here. JavaWriterVisitor writerVisitor = new JavaWriterVisitor(); // header From 558f2c5daf5062298aaadb51827712a9091a09d9 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 12 Apr 2022 02:23:41 +0000 Subject: [PATCH 004/103] add conditionOnClass annotation, parameter not set yet. --- .../SpringAutoConfigClassComposer.java | 20 ++++++++++++++++--- .../SpringAutoConfigClassComposerTest.java | 3 +++ .../gapic/composer/SpringComposerTest.java | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 94e39c6328..80c31f75cf 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -85,30 +85,44 @@ public GapicClass generate(GapicContext ignore, Service service) { .setName(className) .setScope(ScopeNode.PUBLIC) .setMethods(Arrays.asList(createBeanMethod(service))) - .setAnnotations(createClassAnnotations()) + .setAnnotations(createClassAnnotations(service.name())) .build(); return GapicClass.create(kind, classDef); } - private static List createClassAnnotations() { + private static List createClassAnnotations(String serviceName) { TypeNode conditionalOnPropertyType = TypeNode.withReference( VaporReference.builder() .setName("ConditionalOnProperty") .setPakkage("org.springframework.boot.autoconfigure.condition") .build()); + TypeNode conditionalOnClass = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnClass") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + // TODO: AnnotationNode description only accepts String for now. need to extend to params + // and classes. AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() .setType(conditionalOnPropertyType) .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") .build(); + AnnotationNode conditionalOnClassNode = + AnnotationNode.builder() + .setType(conditionalOnClass) + .setDescription("value = " + serviceName) // need to produce XXX.class + .build(); return Arrays.asList( AnnotationNode.builder() .setType(staticTypes.get("Generated")) .setDescription("by gapic-generator-java") .build(), - conditionalOnPropertyNode); + conditionalOnPropertyNode, + conditionalOnClassNode); } private static MethodDefinition createBeanMethod(Service service) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index c4cb869914..409b0c4922 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -182,6 +182,7 @@ public void generateAutoConfigClasses() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); + System.out.println(visitor.write()); assertEquals(EXPECTED_CLASS_STRING, visitor.write()); } @@ -191,12 +192,14 @@ public void generateAutoConfigClasses() { + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + "import org.springframework.context.annotation.Bean;\n" + "\n" + "@Generated(\"by gapic-generator-java\")\n" + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + + "@ConditionalOnClass(\"value = Echo\")\n" + "public class EchoDemo {\n" + "\n" + " @Bean\n" diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java index b087d2281e..b11451c6bd 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java @@ -60,12 +60,14 @@ public class SpringComposerTest { + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" + + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + "import org.springframework.context.annotation.Bean;\n" + "\n" + "@Generated(\"by gapic-generator-java\")\n" + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + + "@ConditionalOnClass(\"value = Echo\")\n" + "public class EchoDemo {\n" + "\n" + " @Bean\n" From c2dfbe0ceb42566139cd78f16860ac08d616e376 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 13 Apr 2022 18:51:05 +0000 Subject: [PATCH 005/103] update name for packaga and class produced. --- .../gapic/composer/SpringAutoConfigClassComposer.java | 4 ++-- .../gapic/composer/SpringAutoConfigClassComposerTest.java | 4 ++-- .../api/generator/gapic/composer/SpringComposerTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 80c31f75cf..9ca89f97b8 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -53,7 +53,7 @@ import javax.annotation.Generated; public class SpringAutoConfigClassComposer implements ClassComposer { - private static final String CLASS_NAME_PATTERN = "%sDemo"; + private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; private static final String OPERATIONS_STUB_MEMBER_NAME = "operationsStub"; private static final String BACKGROUND_RESOURCES_MEMBER_NAME = "backgroundResources"; @@ -69,7 +69,7 @@ public static SpringAutoConfigClassComposer instance() { @Override public GapicClass generate(GapicContext ignore, Service service) { - String packageName = service.pakkage() + ".demo"; + String packageName = service.pakkage() + ".spring"; Map types = createDynamicTypes(service, packageName); String className = getThisClassName(service.name()); GapicClass.Kind kind = Kind.MAIN; diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 409b0c4922..9c9a562121 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -187,7 +187,7 @@ public void generateAutoConfigClasses() { } private static final String EXPECTED_CLASS_STRING = - "package com.google.showcase.v1beta1.demo;\n" + "package com.google.showcase.v1beta1.spring;\n" + "\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" @@ -200,7 +200,7 @@ public void generateAutoConfigClasses() { + "@Generated(\"by gapic-generator-java\")\n" + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + "@ConditionalOnClass(\"value = Echo\")\n" - + "public class EchoDemo {\n" + + "public class EchoSpringAutoConfiguration {\n" + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java index b11451c6bd..5a191efc0b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java @@ -55,7 +55,7 @@ public class SpringComposerTest { + " * limitations under the License.\n" + " */\n" + "\n" - + "package com.google.showcase.v1beta1.demo;\n" + + "package com.google.showcase.v1beta1.spring;\n" + "\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" @@ -68,7 +68,7 @@ public class SpringComposerTest { + "@Generated(\"by gapic-generator-java\")\n" + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + "@ConditionalOnClass(\"value = Echo\")\n" - + "public class EchoDemo {\n" + + "public class EchoSpringAutoConfiguration {\n" + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" From fce094502117f0543f5847f4c8127052ff9bb112 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 27 Jun 2022 20:29:17 +0000 Subject: [PATCH 006/103] producing [name]_java_gapic_srcjar-spring.srcjar. --- rules_java_gapic/java_gapic.bzl | 45 ++++++++++++++++++- .../java/com/google/api/generator/Main.java | 2 + 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index cf5f1f6d55..aa6a832fed 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -22,6 +22,7 @@ def _java_gapic_postprocess_srcjar_impl(ctx): output_main = ctx.outputs.main output_test = ctx.outputs.test output_samples = ctx.outputs.samples + output_spring = ctx.outputs.spring output_resource_name = ctx.outputs.resource_name formatter = ctx.executable.formatter @@ -65,10 +66,21 @@ def _java_gapic_postprocess_srcjar_impl(ctx): cd $WORKING_DIR + unzip -q temp-codegen-spring.srcjar -d {output_dir_path}/spring + # This may fail if there are spaces and/or too many files (exceed max length of command length). + {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ") + + # Spring source files. + cd {output_dir_path}/spring/src/main/java + zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ + + cd $WORKING_DIR + mv {output_srcjar_name}.srcjar {output_main} mv {output_srcjar_name}-resource-name.srcjar {output_resource_name} mv {output_srcjar_name}-tests.srcjar {output_test} mv {output_srcjar_name}-samples.srcjar {output_samples} + mv {output_srcjar_name}-spring.srcjar {output_spring} """.format( gapic_srcjar = gapic_srcjar.path, output_srcjar_name = output_srcjar_name, @@ -79,13 +91,14 @@ def _java_gapic_postprocess_srcjar_impl(ctx): output_resource_name = output_resource_name.path, output_test = output_test.path, output_samples = output_samples.path, + output_spring = output_spring.path, ) ctx.actions.run_shell( inputs = [gapic_srcjar], tools = [formatter], command = script, - outputs = [output_main, output_resource_name, output_test, output_samples], + outputs = [output_main, output_resource_name, output_test, output_samples, output_spring], ) _java_gapic_postprocess_srcjar = rule( @@ -102,6 +115,7 @@ _java_gapic_postprocess_srcjar = rule( "resource_name": "%{name}-resource-name.srcjar", "test": "%{name}-test.srcjar", "samples": "%{name}-samples.srcjar", + "spring": "%{name}-spring.srcjar", }, implementation = _java_gapic_postprocess_srcjar_impl, ) @@ -161,6 +175,21 @@ _java_gapic_samples_srcjar = rule( implementation = _java_gapic_samples_srcjar_impl, ) +#_java_gapic_spring_srcjar = rule( +# attrs = { +# "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True), +# "formatter": attr.label( +# default = Label("//:google_java_format_binary"), +# executable = True, +# cfg = "host", +# ), +# }, +# outputs = { +# "spring": "%{name}-spring.srcjar", +# }, +# implementation = _java_gapic_samples_srcjar_impl, +#) + def _extract_common_proto_dep(dep): return dep[dep.index("/"):] if "//google" in dep else dep @@ -267,6 +296,8 @@ def java_gapic_library( **kwargs ) + print("postprocessing done.\n") + resource_name_name = "%s_resource_name" % name resource_name_deps = [resource_name_name] native.java_library( @@ -365,6 +396,18 @@ def java_gapic_library( deps = [":%s" % name] + actual_test_deps, **kwargs ) +# print("everything else packed, now try to pack spring.\n") +# spring_deps = actual_deps + [ +# +# ] +# # see if this works? no spring dependencies. +# native.java_library( +# name = "%s_spring" % name, +# srcs = ["%s-spring.srcjar" % srcjar_name], +# deps = actual_deps, +# **kwargs +# ) +# print("java_gapic_library is done done.") def java_gapic_test(name, runtime_deps, test_classes, **kwargs): for test_class in test_classes: diff --git a/src/main/java/com/google/api/generator/Main.java b/src/main/java/com/google/api/generator/Main.java index 2ad75c19ba..8357efb6d3 100644 --- a/src/main/java/com/google/api/generator/Main.java +++ b/src/main/java/com/google/api/generator/Main.java @@ -26,6 +26,8 @@ public static void main(String[] args) throws IOException { ProtoRegistry.registerAllExtensions(registry); CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry); CodeGeneratorResponse response = Generator.generateGapic(request); + CodeGeneratorResponse springResponse = Generator.generateSpring(request); response.writeTo(System.out); + springResponse.writeTo(System.out); } } From 70518586e7dd94e60d581801210d210ea08472f0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 29 Jun 2022 18:12:47 +0000 Subject: [PATCH 007/103] adding spring content to produced google-cloud-[name]-v1-java.tar.gz. --- rules_java_gapic/java_gapic.bzl | 87 ++++++++++++++++++++--------- rules_java_gapic/java_gapic_pkg.bzl | 28 +++++++++- 2 files changed, 86 insertions(+), 29 deletions(-) diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index aa6a832fed..b292181514 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -175,20 +175,61 @@ _java_gapic_samples_srcjar = rule( implementation = _java_gapic_samples_srcjar_impl, ) -#_java_gapic_spring_srcjar = rule( -# attrs = { -# "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True), -# "formatter": attr.label( -# default = Label("//:google_java_format_binary"), -# executable = True, -# cfg = "host", -# ), -# }, -# outputs = { -# "spring": "%{name}-spring.srcjar", -# }, -# implementation = _java_gapic_samples_srcjar_impl, -#) + +def _java_gapic_spring_srcjar_impl(ctx): + gapic_srcjar = ctx.file.gapic_srcjar + output_srcjar_name = ctx.label.name + output_spring = ctx.outputs.spring + formatter = ctx.executable.formatter + + output_dir_name = ctx.label.name + output_dir_path = "%s/%s" % (output_spring.dirname, output_dir_name) + + script = """ + unzip -q {gapic_srcjar} + # Sync'd to the output file name in Writer.java. + unzip -q temp-codegen-spring.srcjar -d {output_dir_path} + # This may fail if there are spaces and/or too many files (exceed max length of command length). + {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ") + WORKING_DIR=`pwd` + + # Spring source files. + cd $WORKING_DIR/{output_dir_path}/src/main/java + zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ + + cd $WORKING_DIR + + mv {output_srcjar_name}-spring.srcjar {output_spring} + """.format( + gapic_srcjar = gapic_srcjar.path, + output_srcjar_name = output_srcjar_name, + formatter = formatter, + output_dir_name = output_dir_name, + output_dir_path = output_dir_path, + output_spring = output_spring.path, + ) + + ctx.actions.run_shell( + inputs = [gapic_srcjar], + tools = [formatter], + command = script, + outputs = [output_spring], + ) + +_java_gapic_spring_srcjar = rule( + attrs = { + "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True), + "formatter": attr.label( + default = Label("//:google_java_format_binary"), + executable = True, + cfg = "host", + ), + }, + outputs = { + "spring": "%{name}-spring.srcjar", + }, + implementation = _java_gapic_spring_srcjar_impl, +) def _extract_common_proto_dep(dep): return dep[dep.index("/"):] if "//google" in dep else dep @@ -296,6 +337,12 @@ def java_gapic_library( **kwargs ) + _java_gapic_spring_srcjar( + name = "%s_spring" % name, + gapic_srcjar = "%s.srcjar" % raw_srcjar_name, + **kwargs + ) + print("postprocessing done.\n") resource_name_name = "%s_resource_name" % name @@ -396,18 +443,6 @@ def java_gapic_library( deps = [":%s" % name] + actual_test_deps, **kwargs ) -# print("everything else packed, now try to pack spring.\n") -# spring_deps = actual_deps + [ -# -# ] -# # see if this works? no spring dependencies. -# native.java_library( -# name = "%s_spring" % name, -# srcs = ["%s-spring.srcjar" % srcjar_name], -# deps = actual_deps, -# **kwargs -# ) -# print("java_gapic_library is done done.") def java_gapic_test(name, runtime_deps, test_classes, **kwargs): for test_class in test_classes: diff --git a/rules_java_gapic/java_gapic_pkg.bzl b/rules_java_gapic/java_gapic_pkg.bzl index 66ba5476c5..d17a037ad8 100644 --- a/rules_java_gapic/java_gapic_pkg.bzl +++ b/rules_java_gapic/java_gapic_pkg.bzl @@ -68,6 +68,11 @@ def _gapic_pkg_tar_impl(ctx): for f in s.files.to_list(): samples.append(f) + spring =[] + for s in ctx.attr.spring: + for f in s.files.to_list(): + spring.append(f) + paths = _construct_package_dir_paths( ctx.attr.package_dir, ctx.outputs.pkg, @@ -80,6 +85,11 @@ def _gapic_pkg_tar_impl(ctx): unzip -q ./$s -d {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/samples/snippets/generated/ done + for s in {spring}; do + mkdir -p {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/spring/ + unzip -q ./$s -d {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/spring/ + done + mkdir -p {package_dir_path} for dep in {deps}; do tar -xzpf $dep -C {package_dir_path} @@ -95,13 +105,14 @@ def _gapic_pkg_tar_impl(ctx): package_dir_path = paths.package_dir_path, package_dir = paths.package_dir, samples = " ".join(["'%s'" % s.path for s in samples]), + spring = " ".join(["'%s'" % s.path for s in spring]), pkg = ctx.outputs.pkg.path, tar_cd_suffix = paths.tar_cd_suffix, tar_prefix = paths.tar_prefix, ) ctx.actions.run_shell( - inputs = deps + samples, + inputs = deps + samples + spring, command = script, outputs = [ctx.outputs.pkg], ) @@ -114,6 +125,7 @@ gapic_pkg_tar = rule( attrs = { "deps": attr.label_list(mandatory = True), "samples": attr.label_list(mandatory = False), + "spring": attr.label_list(mandatory = False), "package_dir": attr.string(mandatory = False, default = ""), "extension": attr.string(mandatory = False, default = "tar.gz"), }, @@ -273,6 +285,10 @@ def _java_gapic_srcs_pkg_impl(ctx): if [ -d {package_dir_path}/src/main/java/samples ]; then mv {package_dir_path}/src/main/java/samples {package_dir_path} fi + + if [ -d {package_dir_path}/src/main/java/spring ]; then + mv {package_dir_path}/src/main/java/spring {package_dir_path} + fi done for proto_src in {proto_srcs}; do mkdir -p {package_dir_path}/src/main/proto @@ -318,6 +334,7 @@ def java_gapic_assembly_gradle_pkg( name, deps, include_samples = False, + include_spring = False, assembly_name = None, transport = None, **kwargs): @@ -338,6 +355,7 @@ def java_gapic_assembly_gradle_pkg( grpc_deps = [] proto_deps = [] samples = [] + spring = [] processed_deps = {} #there is no proper Set in Starlark for dep in deps: @@ -345,6 +363,8 @@ def java_gapic_assembly_gradle_pkg( if "_java_gapic" in dep: if include_samples: samples.append(dep + "_samples") + if include_spring: + spring.append(dep + "_spring") _put_dep_in_a_bucket(dep, client_deps, processed_deps) _put_dep_in_a_bucket("%s_test" % dep, client_test_deps, processed_deps) _put_dep_in_a_bucket("%s_resource_name" % dep, proto_deps, processed_deps) @@ -392,7 +412,8 @@ def java_gapic_assembly_gradle_pkg( name = name, assembly_name = package_dir, deps = proto_target_dep + grpc_target_dep + client_target_dep, - samples = samples, + samples = samples, # :vision_java_gapic_samples + spring = spring, # :vision_java_gapic_spring ) def _java_gapic_gradle_pkg( @@ -438,7 +459,7 @@ def _java_gapic_gradle_pkg( **kwargs ) -def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, visibility = None): +def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, spring = None, visibility = None): resource_target_name = "%s-resources" % assembly_name java_gapic_build_configs_pkg( name = resource_target_name, @@ -458,5 +479,6 @@ def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, v ] + deps, samples = samples, package_dir = assembly_name, + spring = spring, visibility = visibility, ) From f9199fd6dcdb27e5a2f5f0d16c99897a2491c4d0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 30 Jun 2022 18:53:47 +0000 Subject: [PATCH 008/103] added private member and constructor to spring autoconfig composer. code needs cleanup. --- .../api/generator/engine/ast/LambdaExpr.java | 17 +- .../SpringAutoConfigClassComposer.java | 341 +++++++++++++++++- .../generator/engine/ast/LambdaExprTest.java | 11 + .../SpringAutoConfigClassComposerTest.java | 191 +++++++++- .../gapic/composer/SpringComposerTest.java | 22 +- 5 files changed, 541 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java b/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java index bb1bc1a397..2b646927f1 100644 --- a/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java +++ b/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java @@ -26,11 +26,7 @@ @AutoValue public abstract class LambdaExpr implements Expr { @Override - public TypeNode type() { - // TODO(v2): Support set of FunctionalInterface parameterized on the args and return type, - // which would enable assignment to an appropriate variable. - return TypeNode.VOID; - } + public abstract TypeNode type(); public abstract ImmutableList arguments(); @@ -46,17 +42,23 @@ public void accept(AstNodeVisitor visitor) { public static Builder builder() { return new AutoValue_LambdaExpr.Builder() .setArguments(Collections.emptyList()) - .setBody(Collections.emptyList()); + .setBody(Collections.emptyList()) + .setType(TypeNode.VOID); } @AutoValue.Builder public abstract static class Builder { + public abstract LambdaExpr.Builder setType(TypeNode type); + public Builder setArguments(VariableExpr... arguments) { return setArguments(Arrays.asList(arguments)); } public abstract Builder setArguments(List arguments); + // Private accessors. + abstract TypeNode type(); + public abstract Builder setBody(List body); public abstract Builder setReturnExpr(ReturnExpr returnExpr); @@ -72,6 +74,9 @@ public LambdaExpr build() { Preconditions.checkState( !lambdaExpr.returnExpr().expr().type().equals(TypeNode.VOID), "Lambdas cannot return void-typed expressions."); + if (type() == null) { + setType(TypeNode.VOID); + } // Must be a declaration. lambdaExpr.arguments().stream() .forEach( diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 9ca89f97b8..999f149b2f 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -25,15 +25,28 @@ import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; +import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; 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.ExprStatement; +import com.google.api.generator.engine.ast.IfStatement; +import com.google.api.generator.engine.ast.LambdaExpr; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.Statement; +import com.google.api.generator.engine.ast.ThisObjectValue; import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.ValueExpr; import com.google.api.generator.engine.ast.VaporReference; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.common.ClassComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; @@ -45,6 +58,7 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -74,6 +88,8 @@ public GapicClass generate(GapicContext ignore, Service service) { String className = getThisClassName(service.name()); GapicClass.Kind kind = Kind.MAIN; + types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); + // header -- not used, add later List fileHeader = Arrays.asList(CommentStatement.withComment(BlockComment.withComment("Apache License"))); @@ -84,12 +100,262 @@ public GapicClass generate(GapicContext ignore, Service service) { .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) - .setMethods(Arrays.asList(createBeanMethod(service))) + .setStatements(createMemberVariables(service.name(), packageName, types)) + .setMethods( + Arrays.asList( + createConstructor(service.name(), className, types), createBeanMethod(service))) .setAnnotations(createClassAnnotations(service.name())) .build(); return GapicClass.create(kind, classDef); } + private static List createMemberVariables( + String serviceName, String packageName, Map types) { + + // private final CredentialsProvider credentialsProvider; + Variable credentialsProviderVar = + Variable.builder() + .setName("credentialsProvider") + .setType(types.get("CredentialsProvider")) + .build(); + VariableExpr credentialsProviderVarExpr = + VariableExpr.builder() + .setVariable(credentialsProviderVar) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement credentialsProviderVarStatement = + ExprStatement.withExpr(credentialsProviderVarExpr); + + // private final LanguageProperties clientProperties; + Variable clientPropertiesVar = + Variable.builder() + .setName("clientProperties") + .setType(types.get(serviceName + "Properties")) + .build(); + VariableExpr clientPropertiesVarExpr = + VariableExpr.builder() + .setVariable(clientPropertiesVar) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement clientPropertiesStatement = ExprStatement.withExpr(clientPropertiesVarExpr); + + // private final GcpProjectIdProvider projectIdProvider; + Variable projectIdProviderVar = + Variable.builder() + .setName("projectIdProvider") + .setType(types.get("GcpProjectIdProvider")) + .build(); + VariableExpr projectIdProviderVarExpr = + VariableExpr.builder() + .setVariable(projectIdProviderVar) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement projectIdProviderStatement = ExprStatement.withExpr(projectIdProviderVarExpr); + + return Arrays.asList( + credentialsProviderVarStatement, clientPropertiesStatement, projectIdProviderStatement); + } + + private static MethodDefinition createConstructor( + String serviceName, String className, Map types) { + /// constructor + VariableExpr credentialsProviderBuilderVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("coreCredentialsProvider") + .setType(types.get("CredentialsProvider")) + .build()); + + VariableExpr coreProjectIdProviderVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("coreProjectIdProvider") + .setType(types.get("GcpProjectIdProvider")) + .build()); + + VariableExpr propertiesVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("clientProperties") + .setType(types.get(serviceName + "Properties")) + .build()); + Variable projectIdProviderVar = + Variable.builder() + .setName("projectIdProvider") + .setType(types.get("GcpProjectIdProvider")) + .build(); + Variable clientPropertiesVar = + Variable.builder() + .setName("clientProperties") + .setType(types.get(serviceName + "Properties")) + .build(); + + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); + + // this.clientProperties = clientProperties; + AssignmentExpr thisPropertiesAssignmentExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(clientPropertiesVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(propertiesVarExpr) + .build(); + ExprStatement thisPropertiesAssignmentStatement = + ExprStatement.withExpr(thisPropertiesAssignmentExpr); + + /** + * if (properties.getCredentials().hasKey()) { this.credentialsProvider = new + * DefaultCredentialsProvider(properties); } else { this.credentialsProvider = + * coreCredentialsProvider; } + */ + + // expr: properties.getCredentials().hasKey() + + MethodInvocationExpr getCredentialsExpr = + MethodInvocationExpr.builder() + .setMethodName("getCredentials") + .setExprReferenceExpr(propertiesVarExpr) + .setReturnType(types.get("Credentials")) + .build(); + MethodInvocationExpr hasKeyExpr = + MethodInvocationExpr.builder() + .setMethodName("hasKey") + .setExprReferenceExpr(getCredentialsExpr) + .setReturnType(TypeNode.BOOLEAN) + .build(); + + // if body: this.credentialsProvider = new DefaultCredentialsProvider(properties) + CastExpr castExpr = + CastExpr.builder() + .setExpr( + NewObjectExpr.builder() + .setType(types.get("DefaultCredentialsProvider")) + .setArguments(propertiesVarExpr) + .build()) + .setType(types.get("CredentialsProvider")) + .build(); + Variable credentialsProviderVar = + Variable.builder() + .setName("credentialsProvider") + .setType(types.get("CredentialsProvider")) + .build(); + AssignmentExpr credentialsProviderssignExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(credentialsProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(castExpr) + .build(); + + // else body: this.credentialsProvider = coreCredentialsProvider; + List coreCredentialsProviderAssignmentExprs = new ArrayList<>(); + coreCredentialsProviderAssignmentExprs.add( + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(credentialsProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr( + CastExpr.builder() + .setExpr(coreProjectIdProviderVarExpr) + .setType(types.get("CredentialsProvider")) + .build()) + .build()); + + IfStatement credentialIfStatement = + IfStatement.builder() + .setConditionExpr(hasKeyExpr) + .setBody(Arrays.asList(ExprStatement.withExpr(credentialsProviderssignExpr))) + .setElseBody( + coreCredentialsProviderAssignmentExprs.stream() + .map(e -> ExprStatement.withExpr(e)) + .collect(Collectors.toList())) + .build(); + + /** + * if (clientProperties.getProjectId() != null) { this.projectIdProvider = + * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } + */ + // else body: this.projectIdProvider = coreProjectIdProvider; + List ctorAssignmentExprs = new ArrayList<>(); + ctorAssignmentExprs.add( + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(projectIdProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(coreProjectIdProviderVarExpr) + .build()); + + // expr: clientProperties.getProjectId() != null + MethodInvocationExpr getProjectIdExpr = + MethodInvocationExpr.builder() + .setMethodName("getProjectId") + .setExprReferenceExpr( + VariableExpr.withVariable(clientPropertiesVar).toBuilder().build()) + // .setStaticReferenceType(clientType) + .setReturnType(types.get("CredentialsProvider")) // fake it + .build(); + RelationalOperationExpr notEqualSentence = + RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); + + // () -> clientProperties.getProjectId(); + LambdaExpr lambdaExpr = + LambdaExpr.builder() + .setReturnExpr(getProjectIdExpr) + .setType(types.get("GcpProjectIdProvider")) + .build(); + + // this.projectIdProvider = () -> clientProperties.getProjectId(); + AssignmentExpr projectIdProviderAssignExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(projectIdProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(lambdaExpr) + .build(); + + IfStatement projectIdProviderIfStatement = + IfStatement.builder() + .setConditionExpr(notEqualSentence) + .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) + .setElseBody( + ctorAssignmentExprs.stream() + .map(e -> ExprStatement.withExpr(e)) + .collect(Collectors.toList())) + .build(); + + return MethodDefinition.constructorBuilder() + .setScope(ScopeNode.PROTECTED) + .setReturnType(types.get(className)) + .setArguments( + Arrays.asList( + credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), + coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build(), + propertiesVarExpr.toBuilder().setIsDecl(true).build())) + .setBody( + Arrays.asList( + thisPropertiesAssignmentStatement, + credentialIfStatement, + projectIdProviderIfStatement)) + .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + .build(); + } + private static List createClassAnnotations(String serviceName) { TypeNode conditionalOnPropertyType = TypeNode.withReference( @@ -200,17 +466,68 @@ private static Map createStaticTypes() { c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); } - private static Map createDynamicTypes(Service service, String stubPakkage) { - return Arrays.asList(CLASS_NAME_PATTERN).stream() - .collect( - Collectors.toMap( - p -> String.format(p, service.name()), - p -> - TypeNode.withReference( - VaporReference.builder() - .setName(String.format(p, service.name())) - .setPakkage(stubPakkage) - .build()))); + private static Map createDynamicTypes(Service service, String packageName) { + Map typeMap = + Arrays.asList(CLASS_NAME_PATTERN).stream() + .collect( + Collectors.toMap( + p -> String.format(p, service.name()), + p -> + TypeNode.withReference( + VaporReference.builder() + .setName(String.format(p, service.name())) + .setPakkage(packageName) + .build()))); + TypeNode credentialsProvider = + TypeNode.withReference( + VaporReference.builder() + .setName("CredentialsProvider") + .setPakkage("com.google.api.gax.core") + .build()); + TypeNode clientProperties = + TypeNode.withReference( + VaporReference.builder() + .setName(service.name() + "Properties") + .setPakkage(packageName) + .build()); + + TypeNode gcpProjectIdProvider = + TypeNode.withReference( + VaporReference.builder() + .setName("GcpProjectIdProvider") + .setPakkage("com.google.cloud.spring.core") + .build()); + + // import com.google.cloud.spring.core.Credentials; + TypeNode credentials = + TypeNode.withReference( + VaporReference.builder() + .setName("Credentials") + .setPakkage("com.google.cloud.spring.core") + .build()); + + // import com.google.cloud.spring.core.DefaultCredentialsProvider; + TypeNode defaultCredentialsProvider = + TypeNode.withReference( + VaporReference.builder() + .setName("DefaultCredentialsProvider") + .setPakkage("com.google.cloud.spring.core") + // TODO: this supre class info is not used, workaround by casting for now. look into + // VaporReference.isSupertypeOrEquals() + .setSupertypeReference( + VaporReference.builder() + .setName("CredentialsProvider") + .setPakkage("com.google.api.gax.core") + .build()) + .build()); + + typeMap.put("CredentialsProvider", credentialsProvider); + typeMap.put(service.name() + "Properties", clientProperties); + typeMap.put("GcpProjectIdProvider", gcpProjectIdProvider); + typeMap.put("Credentials", credentials); + typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); + + return typeMap; } private static String getThisClassName(String serviceName) { diff --git a/src/test/java/com/google/api/generator/engine/ast/LambdaExprTest.java b/src/test/java/com/google/api/generator/engine/ast/LambdaExprTest.java index e4ead3cc87..d6d1334b09 100644 --- a/src/test/java/com/google/api/generator/engine/ast/LambdaExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/LambdaExprTest.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertThrows; import java.util.Arrays; +import org.junit.Assert; import org.junit.Test; public class LambdaExprTest { @@ -27,6 +28,16 @@ public void validLambdaExpr_noArguments() { .build(); } + @Test + public void validLamdaExpr_setType() { + LambdaExpr lambdaExpr = + LambdaExpr.builder() + .setReturnExpr(ValueExpr.withValue(StringObjectValue.withValue("foo"))) + .setType(TypeNode.STRING) + .build(); + Assert.assertEquals(lambdaExpr.type(), TypeNode.STRING); + } + @Test public void validLambdaExpr_severalArguments() { VariableExpr argOneVarExpr = diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 9c9a562121..ce11f43d7d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -17,13 +17,21 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.Expr; +import com.google.api.generator.engine.ast.ExprStatement; +import com.google.api.generator.engine.ast.IfStatement; +import com.google.api.generator.engine.ast.LambdaExpr; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.ThisObjectValue; import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.ValueExpr; import com.google.api.generator.engine.ast.VaporReference; import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; @@ -39,12 +47,14 @@ import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; @@ -141,13 +151,164 @@ public void writeMethodDefinition_constructor() { // Arrays.asList(ExprStatement.withExpr(assignmentExpr))) .build(); + // members + TypeNode credentialsProvider = + TypeNode.withReference( + VaporReference.builder() + .setName("CredentialsProvider") + .setPakkage("com.google.api.gax.core") + .build()); + TypeNode thisClassType = + TypeNode.withReference( + VaporReference.builder() + .setName("LibraryServiceStub") + .setPakkage("com.google.example.library.v1") + .build()); + TypeNode clientProperties = + TypeNode.withReference( + VaporReference.builder() + .setName("LanguageProperties") + .setPakkage("com.google.example.library.v1") + .build()); + // import com.google.cloud.spring.core.GcpProjectIdProvider; + + TypeNode gcpProjectIdProvider = + TypeNode.withReference( + VaporReference.builder() + .setName("GcpProjectIdProvider") + .setPakkage("com.google.cloud.spring.core") + .build()); + // TypeNode thisClassType = + // TypeNode thisClassType = typeStore.get(ClassNames.getServiceSettingsClassName(service)); + + Variable variable = + Variable.builder().setName("credentialsProvider").setType(credentialsProvider).build(); + VariableExpr varExpr = + VariableExpr.builder() + .setVariable(variable) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement statement1 = ExprStatement.withExpr(varExpr); + + // private final LanguageProperties clientProperties; + Variable propertiesVar = + Variable.builder().setName("clientProperties").setType(clientProperties).build(); + VariableExpr propertiesVarExpr = + VariableExpr.builder() + .setVariable(propertiesVar) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement statement2 = ExprStatement.withExpr(propertiesVarExpr); + + // private final GcpProjectIdProvider projectIdProvider; + Variable projectIdProviderVar = + Variable.builder().setName("projectIdProvider").setType(gcpProjectIdProvider).build(); + VariableExpr projectIdProviderVarExpr = + VariableExpr.builder() + .setVariable(projectIdProviderVar) + .setScope(ScopeNode.PRIVATE) + .setIsFinal(true) + .setIsDecl(true) + .build(); + ExprStatement statement3 = ExprStatement.withExpr(projectIdProviderVarExpr); + + /// constructor + VariableExpr credentialsProviderBuilderVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("coreCredentialsProvider") + .setType(credentialsProvider) + .build()); + + VariableExpr coreProjectIdProviderVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("coreProjectIdProvider") + .setType(gcpProjectIdProvider) + .build()); + + List ctorAssignmentExprs = new ArrayList<>(); + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); + ctorAssignmentExprs.add( + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(projectIdProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(coreProjectIdProviderVarExpr) + .build()); + + /** + * if (clientProperties.getProjectId() != null) { this.projectIdProvider = + * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } + */ + + // expr: clientProperties.getProjectId() != null + MethodInvocationExpr getProjectIdExpr = + MethodInvocationExpr.builder() + .setMethodName("getProjectId") + .setExprReferenceExpr(VariableExpr.withVariable(propertiesVar).toBuilder().build()) + // .setStaticReferenceType(clientType) + .setReturnType(credentialsProvider) // fake it + .build(); + RelationalOperationExpr notEqualSentence = + RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); + + // this.projectIdProvider = () -> clientProperties.getProjectId(); + LambdaExpr lambdaExpr = + LambdaExpr.builder().setReturnExpr(getProjectIdExpr).setType(gcpProjectIdProvider).build(); + + // this.projectIdProvider = () -> clientProperties.getProjectId(); + AssignmentExpr projectIdProviderAssignExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(projectIdProviderVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(lambdaExpr) + .build(); + + IfStatement ifStatement = + IfStatement.builder() + .setConditionExpr(notEqualSentence) + .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) + .setElseBody( + ctorAssignmentExprs.stream() + .map(e -> ExprStatement.withExpr(e)) + .collect(Collectors.toList())) + .build(); + + MethodDefinition constructor = + MethodDefinition.constructorBuilder() + .setScope(ScopeNode.PROTECTED) + .setReturnType(thisClassType) + .setArguments( + Arrays.asList( + credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), + coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build())) + // .setThrowsExceptions(Arrays.asList(FIXED_TYPESTORE.get("IOException"))) + .setBody(Arrays.asList(ifStatement)) + .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + // ctorAssignmentExprs.stream() + // .map(e -> ExprStatement.withExpr(e)) + // .collect(Collectors.toList())) + .build(); + /// end constructor + ClassDefinition classDef = ClassDefinition.builder() .setFileHeader(fileHeader) .setPackageString("com.google.example.library.v1") .setName("LibraryServiceStub") .setScope(ScopeNode.PUBLIC) - .setMethods(Arrays.asList(beanMethod)) + .setStatements(Arrays.asList(statement1, statement2, statement3)) + .setMethods(Arrays.asList(constructor, beanMethod)) .setAnnotations(Arrays.asList(conditionalOnPropertyNode)) .build(); @@ -186,9 +347,13 @@ public void generateAutoConfigClasses() { assertEquals(EXPECTED_CLASS_STRING, visitor.write()); } - private static final String EXPECTED_CLASS_STRING = + protected static final String EXPECTED_CLASS_STRING = "package com.google.showcase.v1beta1.spring;\n" + "\n" + + "import com.google.api.gax.core.CredentialsProvider;\n" + + "import com.google.cloud.spring.core.Credentials;\n" + + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" + + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" @@ -201,6 +366,28 @@ public void generateAutoConfigClasses() { + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + "@ConditionalOnClass(\"value = Echo\")\n" + "public class EchoSpringAutoConfiguration {\n" + + " private final CredentialsProvider credentialsProvider;\n" + + " private final EchoProperties clientProperties;\n" + + " private final GcpProjectIdProvider projectIdProvider;\n" + + "\n" + + " protected EchoSpringAutoConfiguration(\n" + + " CredentialsProvider coreCredentialsProvider,\n" + + " GcpProjectIdProvider coreProjectIdProvider,\n" + + " EchoProperties clientProperties)\n" + + " throws IOException {\n" + + " this.clientProperties = clientProperties;\n" + + " if (clientProperties.getCredentials().hasKey()) {\n" + + " this.credentialsProvider =\n" + + " ((CredentialsProvider) new DefaultCredentialsProvider(clientProperties));\n" + + " } else {\n" + + " this.credentialsProvider = ((CredentialsProvider) coreProjectIdProvider);\n" + + " }\n" + + " if (clientProperties.getProjectId() != null) {\n" + + " this.projectIdProvider = () -> clientProperties.getProjectId();\n" + + " } else {\n" + + " this.projectIdProvider = coreProjectIdProvider;\n" + + " }\n" + + " }\n" + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java index 5a191efc0b..fbeb90c07c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java @@ -55,27 +55,7 @@ public class SpringComposerTest { + " * limitations under the License.\n" + " */\n" + "\n" - + "package com.google.showcase.v1beta1.spring;\n" - + "\n" - + "import com.google.showcase.v1beta1.EchoClient;\n" - + "import java.io.IOException;\n" - + "import javax.annotation.Generated;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" - + "import org.springframework.context.annotation.Bean;\n" - + "\n" - + "@Generated(\"by gapic-generator-java\")\n" - + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" - + "@ConditionalOnClass(\"value = Echo\")\n" - + "public class EchoSpringAutoConfiguration {\n" - + "\n" - + " @Bean\n" - + " @ConditionalOnMissingBean\n" - + " public EchoClient echoClient() throws IOException {\n" - + " return EchoClient.create();\n" - + " }\n" - + "}\n"; + + SpringAutoConfigClassComposerTest.EXPECTED_CLASS_STRING; @Before public void setUp() { From fbdc282776942622fbde2a5991dfe85b8ff375d6 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 11 Jul 2022 18:19:02 +0000 Subject: [PATCH 009/103] use new lambdaExpr infer type feature. --- .../composer/SpringAutoConfigClassComposer.java | 12 ++++++------ .../composer/SpringAutoConfigClassComposerTest.java | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 999f149b2f..04666c46da 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -312,11 +312,7 @@ private static MethodDefinition createConstructor( RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); // () -> clientProperties.getProjectId(); - LambdaExpr lambdaExpr = - LambdaExpr.builder() - .setReturnExpr(getProjectIdExpr) - .setType(types.get("GcpProjectIdProvider")) - .build(); + LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); // this.projectIdProvider = () -> clientProperties.getProjectId(); AssignmentExpr projectIdProviderAssignExpr = @@ -326,7 +322,11 @@ private static MethodDefinition createConstructor( .toBuilder() .setExprReferenceExpr(thisExpr) .build()) - .setValueExpr(lambdaExpr) + .setValueExpr( + CastExpr.builder() + .setExpr(lambdaExpr) + .setType(types.get("GcpProjectIdProvider")) + .build()) .build(); IfStatement projectIdProviderIfStatement = diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index ce11f43d7d..703a8fc424 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -19,6 +19,7 @@ import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; +import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.engine.ast.Expr; @@ -260,8 +261,7 @@ public void writeMethodDefinition_constructor() { RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); // this.projectIdProvider = () -> clientProperties.getProjectId(); - LambdaExpr lambdaExpr = - LambdaExpr.builder().setReturnExpr(getProjectIdExpr).setType(gcpProjectIdProvider).build(); + LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); // this.projectIdProvider = () -> clientProperties.getProjectId(); AssignmentExpr projectIdProviderAssignExpr = @@ -271,7 +271,8 @@ public void writeMethodDefinition_constructor() { .toBuilder() .setExprReferenceExpr(thisExpr) .build()) - .setValueExpr(lambdaExpr) + .setValueExpr( + CastExpr.builder().setExpr(lambdaExpr).setType(gcpProjectIdProvider).build()) .build(); IfStatement ifStatement = @@ -383,7 +384,7 @@ public void generateAutoConfigClasses() { + " this.credentialsProvider = ((CredentialsProvider) coreProjectIdProvider);\n" + " }\n" + " if (clientProperties.getProjectId() != null) {\n" - + " this.projectIdProvider = () -> clientProperties.getProjectId();\n" + + " this.projectIdProvider = ((GcpProjectIdProvider) () -> clientProperties.getProjectId());\n" + " } else {\n" + " this.projectIdProvider = coreProjectIdProvider;\n" + " }\n" From 7390d7a0df871879e2815bd2b291310d2c136aa2 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 11 Jul 2022 19:33:35 +0000 Subject: [PATCH 010/103] adding writing spring.factories. also adjust output path to google-cloud-[name]-[v]-java/spring/src/main/... --- rules_java_gapic/java_gapic.bzl | 4 +-- .../google/api/generator/gapic/Generator.java | 4 +-- .../generator/gapic/protowriter/Writer.java | 28 +++++++++++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index b292181514..fc3b875e65 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -71,7 +71,7 @@ def _java_gapic_postprocess_srcjar_impl(ctx): {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ") # Spring source files. - cd {output_dir_path}/spring/src/main/java + cd {output_dir_path}/spring zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ cd $WORKING_DIR @@ -194,7 +194,7 @@ def _java_gapic_spring_srcjar_impl(ctx): WORKING_DIR=`pwd` # Spring source files. - cd $WORKING_DIR/{output_dir_path}/src/main/java + cd $WORKING_DIR/{output_dir_path} zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ cd $WORKING_DIR diff --git a/src/main/java/com/google/api/generator/gapic/Generator.java b/src/main/java/com/google/api/generator/gapic/Generator.java index abf633767d..85625a7ee1 100644 --- a/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/src/main/java/com/google/api/generator/gapic/Generator.java @@ -31,7 +31,7 @@ public static CodeGeneratorResponse generateGapic(CodeGeneratorRequest request) List clazzes = Composer.composeServiceClasses(context); GapicPackageInfo packageInfo = Composer.composePackageInfo(context); String outputFilename = "temp-codegen.srcjar"; - return Writer.write(context, clazzes, packageInfo, outputFilename); + return Writer.write(context, clazzes, packageInfo, outputFilename, false); } public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) { @@ -40,6 +40,6 @@ public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); GapicPackageInfo packageInfo = Composer.composePackageInfo(context); String outputFilename = "temp-codegen-spring.srcjar"; - return Writer.write(context, clazzes, packageInfo, outputFilename); + return Writer.write(context, clazzes, packageInfo, outputFilename, true); } } diff --git a/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java b/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java index 35f9f21fdb..4595af28d9 100644 --- a/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java +++ b/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; +import java.util.StringJoiner; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; @@ -46,7 +47,8 @@ public static CodeGeneratorResponse write( GapicContext context, List clazzes, GapicPackageInfo gapicPackageInfo, - String outputFilePath) { + String outputFilePath, + boolean isSpringContent) { ByteString.Output output = ByteString.newOutput(); JavaWriterVisitor codeWriter = new JavaWriterVisitor(); JarOutputStream jos; @@ -61,7 +63,9 @@ public static CodeGeneratorResponse write( writeSamples(gapicClazz, getSamplePackage(gapicClazz), classPath, jos); } - writeMetadataFile(context, writePackageInfo(gapicPackageInfo, codeWriter, jos), jos); + if (isSpringContent) { + writeSpringFactories(context, jos); + } try { jos.finish(); @@ -159,6 +163,26 @@ private static void writeMetadataFile(GapicContext context, String path, JarOutp } } + private static void writeSpringFactories(GapicContext context, JarOutputStream jos) { + String path = "src/main/resources/META-INF"; + JarEntry jarEntry = new JarEntry(String.format("%s/spring.factories", path)); + try { + jos.putNextEntry(jarEntry); + StringJoiner sb = + new StringJoiner( + ",\\\n", "org.springframework.boot.autoconfigure.EnableAutoConfiguration=\\\n", ""); + context + .services() + .forEach( + service -> + sb.add(String.format("com.sample.autoconfig.%sAutoConfig", service.name()))); + + jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write spring.factories", e); + } + } + private static String getPath(String pakkage, String className) { String path = pakkage.replaceAll("\\.", "/"); if (className.startsWith("Mock") || className.endsWith("Test")) { From b937bb177f22f9bfcae24028f1bcc39c027ed91b Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 9 Aug 2022 13:43:26 +0000 Subject: [PATCH 011/103] added RETRY_PARAM_DEFINITIONS map to generated code. --- .../SpringAutoConfigClassComposer.java | 84 +++++++++++++++++-- .../SpringAutoConfigClassComposerTest.java | 24 ++++++ .../gapic/composer/SpringComposerTest.java | 14 ++++ 3 files changed, 117 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 04666c46da..415f6c30fa 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -18,6 +18,7 @@ import com.google.api.gax.core.BackgroundResourceAggregation; import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.ClientStreamingCallable; @@ -27,6 +28,7 @@ import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; +import com.google.api.generator.engine.ast.BlockStatement; import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.CommentStatement; @@ -48,11 +50,14 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.common.ClassComposer; +import com.google.api.generator.gapic.composer.common.RetrySettingsComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; +import com.google.common.collect.ImmutableMap; import com.google.longrunning.Operation; import com.google.longrunning.stub.GrpcOperationsStub; import io.grpc.MethodDescriptor; @@ -70,11 +75,15 @@ public class SpringAutoConfigClassComposer implements ClassComposer { private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; private static final String OPERATIONS_STUB_MEMBER_NAME = "operationsStub"; private static final String BACKGROUND_RESOURCES_MEMBER_NAME = "backgroundResources"; + private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS"; private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); private static final Map staticTypes = createStaticTypes(); + private static final VariableExpr NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR = + createNestedRetryParamDefinitionsVarExpr(); + private SpringAutoConfigClassComposer() {} public static SpringAutoConfigClassComposer instance() { @@ -82,12 +91,38 @@ public static SpringAutoConfigClassComposer instance() { } @Override - public GapicClass generate(GapicContext ignore, Service service) { + public GapicClass generate(GapicContext context, Service service) { String packageName = service.pakkage() + ".spring"; Map types = createDynamicTypes(service, packageName); String className = getThisClassName(service.name()); GapicClass.Kind kind = Kind.MAIN; + GapicServiceConfig gapicServiceConfig = context.serviceConfig(); + // + // for (Method method : service.methods()) { + // // do retry settings. + // + // Method.Stream streamKind = method.stream(); + // if (streamKind.equals(Method.Stream.CLIENT) || streamKind.equals(Method.Stream.BIDI)) { + // continue; + // } + // if (!Objects.isNull(gapicServiceConfig) && gapicServiceConfig.hasBatchingSetting(service, + // method)) { + // Optional batchingSettingOpt = + // gapicServiceConfig.getBatchingSetting(service, method); + // Preconditions.checkState( + // batchingSettingOpt.isPresent(), + // String.format( + // "No batching setting found for service %s, method %s", + // service.name(), method.name())); + // String settingsGetterMethodName = + // String.format("%sSettings", JavaStyle.toLowerCamelCase(method.name())); + // // bodyStatement.add(); + // + // String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); + // } + // } + types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); // header -- not used, add later @@ -100,7 +135,7 @@ public GapicClass generate(GapicContext ignore, Service service) { .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) - .setStatements(createMemberVariables(service.name(), packageName, types)) + .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) .setMethods( Arrays.asList( createConstructor(service.name(), className, types), createBeanMethod(service))) @@ -109,9 +144,28 @@ public GapicClass generate(GapicContext ignore, Service service) { return GapicClass.create(kind, classDef); } + private static VariableExpr createNestedRetryParamDefinitionsVarExpr() { + TypeNode varType = + TypeNode.withReference( + ConcreteReference.builder() + .setClazz(ImmutableMap.class) + .setGenerics( + Arrays.asList(TypeNode.STRING, staticTypes.get("RetrySettings")).stream() + .map(t -> t.reference()) + .collect(Collectors.toList())) + .build()); + + return VariableExpr.withVariable( + Variable.builder().setType(varType).setName(RETRY_PARAM_DEFINITIONS_VAR_NAME).build()); + } + private static List createMemberVariables( - String serviceName, String packageName, Map types) { + Service service, + String packageName, + Map types, + GapicServiceConfig serviceConfig) { + String serviceName = service.name(); // private final CredentialsProvider credentialsProvider; Variable credentialsProviderVar = Variable.builder() @@ -158,8 +212,27 @@ private static List createMemberVariables( .build(); ExprStatement projectIdProviderStatement = ExprStatement.withExpr(projectIdProviderVarExpr); + // Declare the RETRY_PARAM_DEFINITIONS map. + ExprStatement retryPramStatement = + ExprStatement.withExpr( + NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR + .toBuilder() + .setIsDecl(true) + .setScope(ScopeNode.PRIVATE) + .setIsStatic(true) + .setIsFinal(true) + .build()); + + BlockStatement retryParamDefinitionsBlock = + RetrySettingsComposer.createRetryParamDefinitionsBlock( + service, serviceConfig, NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR); + return Arrays.asList( - credentialsProviderVarStatement, clientPropertiesStatement, projectIdProviderStatement); + credentialsProviderVarStatement, + clientPropertiesStatement, + projectIdProviderStatement, + retryPramStatement, + retryParamDefinitionsBlock); } private static MethodDefinition createConstructor( @@ -458,7 +531,8 @@ private static Map createStaticTypes() { ProtoUtils.class, ServerStreamingCallable.class, TimeUnit.class, - UnaryCallable.class); + UnaryCallable.class, + RetrySettings.class); return concreteClazzes.stream() .collect( Collectors.toMap( diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 703a8fc424..80d2edf138 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic.composer; import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; @@ -37,17 +38,22 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.common.TestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.gapic.protoparser.Parser; +import com.google.api.generator.gapic.protoparser.ServiceConfigParser; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -330,6 +336,12 @@ public void generateAutoConfigClasses() { Parser.parseService( echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + String jsonFilename = "retrying_grpc_service_config.json"; + Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); + Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); + assertTrue(serviceConfigOpt.isPresent()); + GapicServiceConfig serviceConfig = serviceConfigOpt.get(); + GapicContext context = GapicContext.builder() .setMessages(messageTypes) @@ -337,6 +349,7 @@ public void generateAutoConfigClasses() { .setServices(services) .setHelperResourceNames(outputResourceNames) .setTransport(Transport.GRPC) + .setServiceConfig(serviceConfig) .build(); Service echoProtoService = services.get(0); @@ -352,9 +365,11 @@ public void generateAutoConfigClasses() { "package com.google.showcase.v1beta1.spring;\n" + "\n" + "import com.google.api.gax.core.CredentialsProvider;\n" + + "import com.google.api.gax.retrying.RetrySettings;\n" + "import com.google.cloud.spring.core.Credentials;\n" + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" @@ -370,6 +385,15 @@ public void generateAutoConfigClasses() { + " private final CredentialsProvider credentialsProvider;\n" + " private final EchoProperties clientProperties;\n" + " private final GcpProjectIdProvider projectIdProvider;\n" + + " private static final ImmutableMap RETRY_PARAM_DEFINITIONS;\n" + + "\n" + + " static {\n" + + " ImmutableMap.Builder definitions = ImmutableMap.builder();\n" + + " RetrySettings settings = null;\n" + + " settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();\n" + + " definitions.put(\"no_retry_params\", settings);\n" + + " RETRY_PARAM_DEFINITIONS = definitions.build();\n" + + " }\n" + "\n" + " protected EchoSpringAutoConfiguration(\n" + " CredentialsProvider coreCredentialsProvider,\n" diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java index fbeb90c07c..9f00a78353 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java @@ -14,18 +14,25 @@ package com.google.api.generator.gapic.composer; +import static org.junit.Assert.assertTrue; + import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.common.TestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.gapic.protoparser.Parser; +import com.google.api.generator.gapic.protoparser.ServiceConfigParser; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -73,6 +80,12 @@ public void setUp() { Parser.parseService( echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + String jsonFilename = "retrying_grpc_service_config.json"; + Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); + Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); + assertTrue(serviceConfigOpt.isPresent()); + GapicServiceConfig serviceConfig = serviceConfigOpt.get(); + context = GapicContext.builder() .setMessages(messageTypes) @@ -80,6 +93,7 @@ public void setUp() { .setServices(services) .setHelperResourceNames(outputResourceNames) .setTransport(Transport.GRPC) + .setServiceConfig(serviceConfig) .build(); } From cc14a8c06ddd8ffcd7b111426abb1142364be8d9 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 23 Aug 2022 20:06:01 +0000 Subject: [PATCH 012/103] added SpringPropertiesClassComposer and test. Added util method to RetrySettingsComposer to help generate declare,getter,setters for retrysettings in properties. Other WIP changes in AutoConfig. --- .../SpringAutoConfigClassComposer.java | 9 +- .../SpringPropertiesClassComposer.java | 348 ++++++++++++++++++ .../common/RetrySettingsComposer.java | 74 ++++ .../SpringAutoConfigClassComposerTest.java | 42 ++- 4 files changed, 467 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 415f6c30fa..2eae0698ed 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -98,7 +98,8 @@ public GapicClass generate(GapicContext context, Service service) { GapicClass.Kind kind = Kind.MAIN; GapicServiceConfig gapicServiceConfig = context.serviceConfig(); - // + + // WIP: retry settings. // for (Method method : service.methods()) { // // do retry settings. // @@ -106,8 +107,8 @@ public GapicClass generate(GapicContext context, Service service) { // if (streamKind.equals(Method.Stream.CLIENT) || streamKind.equals(Method.Stream.BIDI)) { // continue; // } - // if (!Objects.isNull(gapicServiceConfig) && gapicServiceConfig.hasBatchingSetting(service, - // method)) { + // if (!Objects.isNull(gapicServiceConfig) + // && gapicServiceConfig.hasBatchingSetting(service, method)) { // Optional batchingSettingOpt = // gapicServiceConfig.getBatchingSetting(service, method); // Preconditions.checkState( @@ -561,7 +562,7 @@ private static Map createDynamicTypes(Service service, String TypeNode clientProperties = TypeNode.withReference( VaporReference.builder() - .setName(service.name() + "Properties") + .setName(service.name() + "SpringProperties") .setPakkage(packageName) .build()); diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java new file mode 100644 index 0000000000..8a942871b0 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java @@ -0,0 +1,348 @@ +// 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; + +import static com.google.api.generator.engine.ast.NewObjectExpr.*; + +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.AssignmentExpr; +import com.google.api.generator.engine.ast.AstNode; +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.ConcreteReference; +import com.google.api.generator.engine.ast.Expr; +import com.google.api.generator.engine.ast.ExprStatement; +import com.google.api.generator.engine.ast.MethodDefinition; +import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.Statement; +import com.google.api.generator.engine.ast.StringObjectValue; +import com.google.api.generator.engine.ast.ThisObjectValue; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.ValueExpr; +import com.google.api.generator.engine.ast.VaporReference; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; +import com.google.api.generator.gapic.composer.common.ClassComposer; +import com.google.api.generator.gapic.composer.common.RetrySettingsComposer; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicClass.Kind; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicServiceConfig; +import com.google.api.generator.gapic.model.Service; +import com.google.common.base.CaseFormat; +import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class SpringPropertiesClassComposer implements ClassComposer { + private static final String CLASS_NAME_PATTERN = "%sSpringProperties"; + + private static final Map staticTypes = createStaticTypes(); + private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS"; + private static final VariableExpr NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR = + createNestedRetryParamDefinitionsVarExpr(); + + private static final SpringPropertiesClassComposer INSTANCE = new SpringPropertiesClassComposer(); + + public static SpringPropertiesClassComposer instance() { + return INSTANCE; + } + + @Override + public GapicClass generate(GapicContext context, Service service) { + String packageName = service.pakkage() + ".spring"; + String className = String.format(CLASS_NAME_PATTERN, service.name()); + GapicServiceConfig gapicServiceConfig = context.serviceConfig(); + Map types = createDynamicTypes(service, packageName); + + ClassDefinition classDef = + ClassDefinition.builder() + .setPackageString(packageName) + .setName(className) + .setScope(ScopeNode.PUBLIC) + .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) + .setMethods(createGetterSetters(service, types, gapicServiceConfig)) + .build(); + return GapicClass.create(Kind.MAIN, classDef); + // return null; + } + + private static VariableExpr createNestedRetryParamDefinitionsVarExpr() { + TypeNode varType = + TypeNode.withReference( + ConcreteReference.builder() + .setClazz(ImmutableMap.class) + .setGenerics( + Arrays.asList(TypeNode.STRING, staticTypes.get("RetrySettings")).stream() + .map(t -> t.reference()) + .collect(Collectors.toList())) + .build()); + + return VariableExpr.withVariable( + Variable.builder().setType(varType).setName(RETRY_PARAM_DEFINITIONS_VAR_NAME).build()); + } + + private static ExprStatement createMemberVarStatement( + String varName, TypeNode varType, boolean isFinal, Expr defaultVal) { + Variable memberVar = Variable.builder().setName(varName).setType(varType).build(); + VariableExpr memberVarExpr = + VariableExpr.builder() + .setVariable(memberVar) + .setScope(ScopeNode.PRIVATE) + .setIsDecl(true) + .setIsFinal(isFinal) + .build(); + + if (defaultVal == null) { + return ExprStatement.withExpr(memberVarExpr); + } + AssignmentExpr assignmentExpr = + AssignmentExpr.builder() + .setVariableExpr(memberVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(defaultVal) + .build(); + ExprStatement memberVarStatement = ExprStatement.withExpr(assignmentExpr); + + return memberVarStatement; + } + + private static List createMemberVariables( + Service service, + String packageName, + Map types, + GapicServiceConfig serviceConfig) { + + String serviceName = service.name(); + // @NestedConfigurationProperty + // private final Credentials credentials = new + // Credentials("https://www.googleapis.com/auth/cloud-language"); + NewObjectExpr defaultCredentialScopes = + builder() + .setType(types.get("Credentials")) + .setArguments( + service.oauthScopes().stream() + .map(x -> ValueExpr.withValue(StringObjectValue.withValue(x))) + .collect(Collectors.toList())) + .build(); + ExprStatement credentialsStatement = + createMemberVarStatement( + "credentials", types.get("Credentials"), true, defaultCredentialScopes); + + // private String quotaProjectId; + ExprStatement quotaProjectIdVarStatement = + createMemberVarStatement("quotaProjectId", TypeNode.STRING, false, null); + + // private Integer executorThreadCount; + ExprStatement executorThreadCountVarStatement = + createMemberVarStatement("executorThreadCount", TypeNode.INT_OBJECT, false, null); + + // private boolean useRest = false; + ExprStatement useRestVarStatement = + createMemberVarStatement("useRest", TypeNode.BOOLEAN, false, null); + + // + // private static final ImmutableMap RETRY_PARAM_DEFINITIONS; + + // // Declare the RETRY_PARAM_DEFINITIONS map. + // ExprStatement retryPramStatement = + // ExprStatement.withExpr( + // NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR + // .toBuilder() + // .setIsDecl(true) + // .setScope(ScopeNode.PRIVATE) + // .setIsStatic(true) + // .setIsFinal(true) + // .build()); + // + // BlockStatement retryParamDefinitionsBlock = + // RetrySettingsComposer.createRetryParamDefinitionsBlock( + // service, serviceConfig, NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR); + + // declare each retry settings with its default value. + TypeNode thisClassType = types.get(service.name() + "Properties"); + List retrySettings = + RetrySettingsComposer.processRetrySettings( + service, + serviceConfig, + thisClassType, + (String propertyName, Expr defaultVal) -> { + List getterAndSetter = new ArrayList<>(); + TypeNode propertyType = defaultVal.type(); + ExprStatement retrySettingsStatement = + createMemberVarStatement(propertyName, propertyType, false, defaultVal); + getterAndSetter.add(retrySettingsStatement); + return getterAndSetter; + }); + + List statements = + retrySettings.stream().map(x -> (Statement) x).collect(Collectors.toList()); + statements.add(credentialsStatement); + statements.add(quotaProjectIdVarStatement); + statements.add(executorThreadCountVarStatement); + return statements; + } + + private static List createGetterSetters( + Service service, Map types, GapicServiceConfig gapicServiceConfig) { + + TypeNode thisClassType = types.get(service.name() + "Properties"); + List methodDefinitions = new ArrayList<>(); + + methodDefinitions.add( + createGetterMethod( + thisClassType, + "credentials", + types.get("Credentials"), + Arrays.asList(AnnotationNode.OVERRIDE))); + methodDefinitions.add( + createGetterMethod(thisClassType, "quotaProjectId", TypeNode.STRING, null)); + methodDefinitions.add(createSetterMethod(thisClassType, "quotaProjectId", TypeNode.STRING)); + methodDefinitions.add(createGetterMethod(thisClassType, "useRest", TypeNode.BOOLEAN, null)); + methodDefinitions.add( + createGetterMethod(thisClassType, "executorThreadCount", TypeNode.INT_OBJECT, null)); + methodDefinitions.add( + createSetterMethod(thisClassType, "executorThreadCount", TypeNode.INT_OBJECT)); + + List retrySettings = + RetrySettingsComposer.processRetrySettings( + service, + gapicServiceConfig, + thisClassType, + (String propertyName, Expr defaultVal) -> { + List getterAndSetter = new ArrayList<>(); + TypeNode propertyType = defaultVal.type(); + getterAndSetter.add( + createGetterMethod(thisClassType, propertyName, propertyType, null)); + getterAndSetter.add(createSetterMethod(thisClassType, propertyName, propertyType)); + return getterAndSetter; + }); + + methodDefinitions.addAll(retrySettings); + // TODO: This can be for future stages. for long running operations: + // for (Method method : service.methods()) { + // if (!method.hasLro()) { + // continue; + // } + // // + // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createLroSettingsBuilderExpr + // // %sOperationSettings + // } + + return methodDefinitions; + } + + private static MethodDefinition createGetterMethod( + TypeNode thisClassType, + String propertyName, + TypeNode returnType, + List annotationNodes) { + + Variable propertyVar = Variable.builder().setName(propertyName).setType(returnType).build(); + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); + + VariableExpr propertyVariableExpr = + VariableExpr.withVariable(propertyVar).toBuilder().setExprReferenceExpr(thisExpr).build(); + + String methodName = "get" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, propertyName); + + return MethodDefinition.builder() + .setName(methodName) + .setScope(ScopeNode.PUBLIC) + .setReturnType(returnType) + .setAnnotations(annotationNodes == null ? Collections.emptyList() : annotationNodes) + .setReturnExpr(propertyVariableExpr) + .build(); + } + + private static MethodDefinition createSetterMethod( + TypeNode thisClassType, String propertyName, TypeNode returnType) { + Variable propertyVar = Variable.builder().setName(propertyName).setType(returnType).build(); + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); + + AssignmentExpr propertyVarExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable(propertyVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build()) + .setValueExpr(VariableExpr.withVariable(propertyVar)) + .build(); + + String methodName = "set" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, propertyName); + + return MethodDefinition.builder() + .setName(methodName) + .setScope(ScopeNode.PUBLIC) + .setReturnType(TypeNode.VOID) + .setArguments(VariableExpr.builder().setVariable(propertyVar).setIsDecl(true).build()) + .setBody(Arrays.asList(ExprStatement.withExpr(propertyVarExpr))) + .build(); + } + + private static Map createDynamicTypes(Service service, String packageName) { + Map typeMap = + Arrays.asList(CLASS_NAME_PATTERN).stream() + .collect( + Collectors.toMap( + p -> String.format(p, service.name()), + p -> + TypeNode.withReference( + VaporReference.builder() + .setName(String.format(p, service.name())) + .setPakkage(packageName) + .build()))); + TypeNode clientProperties = + TypeNode.withReference( + VaporReference.builder() + .setName(service.name() + "SpringProperties") + .setPakkage(packageName) + .build()); + + // import com.google.cloud.spring.core.Credentials; + TypeNode credentials = + TypeNode.withReference( + VaporReference.builder() + .setName("Credentials") + .setPakkage("com.google.cloud.spring.core") + .build()); + + // import org.threeten.bp.Duration; + TypeNode duration = + TypeNode.withReference( + VaporReference.builder().setName("Duration").setPakkage("org.threeten.bp").build()); + + typeMap.put(service.name() + "Properties", clientProperties); + typeMap.put("Credentials", credentials); + typeMap.put("Duration", duration); + + return typeMap; + } + + private static Map createStaticTypes() { + List concreteClazzes = + Arrays.asList(RetrySettings.class, org.threeten.bp.Duration.class); + return concreteClazzes.stream() + .collect( + Collectors.toMap( + c -> c.getSimpleName(), + c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); + } +} diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java index e5e4ad4195..105d4c0ac7 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java @@ -24,6 +24,7 @@ import com.google.api.gax.rpc.StatusCode; import com.google.api.gax.rpc.UnaryCallSettings; import com.google.api.generator.engine.ast.AssignmentExpr; +import com.google.api.generator.engine.ast.AstNode; import com.google.api.generator.engine.ast.BlockStatement; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.EnumRefExpr; @@ -44,6 +45,7 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; +import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -57,6 +59,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -464,6 +467,76 @@ public static Expr createBatchingBuilderSettingsExpr( .build(); } + public static List processRetrySettings( + Service service, + GapicServiceConfig gapicServiceConfig, + TypeNode thisClassType, + BiFunction> processFunc) { + List resultList = new ArrayList<>(); + for (Method method : service.methods()) { + String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, method.name()); + String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); + // follow logic in: + // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs + // Build the settings object for each config. + + String settingsName = retryParamName; + GapicRetrySettings settings = + gapicServiceConfig.getAllGapicRetrySettings(service).get(retryParamName); + RetryPolicy retryPolicy = settings.retryPolicy(); + if (settings.kind().equals(GapicRetrySettings.Kind.FULL)) { + Preconditions.checkState( + retryPolicy.hasInitialBackoff(), + String.format("initialBackoff not found for setting %s", settingsName)); + + resultList.addAll( + processFunc.apply( + methodName + "InitialRetryDelay", + createDurationOfMillisExpr(toValExpr(retryPolicy.getInitialBackoff())))); + + resultList.addAll( + processFunc.apply( + methodName + "RetryDelayMultiplier", + toValExpr(retryPolicy.getBackoffMultiplier()))); + + Preconditions.checkState( + retryPolicy.hasMaxBackoff(), + String.format("maxBackoff not found for setting %s", settingsName)); + + resultList.addAll( + processFunc.apply( + methodName + "MaxRetryDelay", + createDurationOfMillisExpr(toValExpr(retryPolicy.getMaxBackoff())))); + } + + if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { + + resultList.addAll( + processFunc.apply( + methodName + "InitialRpcTimeout", + createDurationOfMillisExpr(toValExpr(settings.timeout())))); + } + + // This will always be done, no matter the type of the retry settings object. + resultList.addAll( + processFunc.apply( + methodName + "RpcTimeoutMultiplier", + ValueExpr.withValue( + PrimitiveValue.builder().setType(TypeNode.DOUBLE).setValue("1.0").build()))); + + if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { + for (String setterMethodName : Arrays.asList("MaxRpcTimeout", "TotalTimeout")) { + + resultList.addAll( + processFunc.apply( + methodName + setterMethodName, + createDurationOfMillisExpr(toValExpr(settings.timeout())))); + } + } + } + return resultList; + } + private static Expr createRetryCodeDefinitionExpr( String codeName, List retryCodes, VariableExpr definitionsVarExpr) { // Construct something like `definitions.put("code_name", @@ -707,6 +780,7 @@ private static MethodInvocationExpr createDurationOfMillisExpr(ValueExpr valExpr .setStaticReferenceType(FIXED_TYPESTORE.get("Duration")) .setMethodName("ofMillis") .setArguments(valExpr) + .setReturnType(FIXED_TYPESTORE.get("Duration")) .build(); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 80d2edf138..c2b334ded3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -361,6 +361,44 @@ public void generateAutoConfigClasses() { assertEquals(EXPECTED_CLASS_STRING, visitor.write()); } + @Test + public void generatePropertiesTest() { + + Map messageTypes = Parser.parseMessages(echoFileDescriptor); + + Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); + Set outputResourceNames = new HashSet<>(); + + List services = + Parser.parseService( + echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + + String jsonFilename = "showcase_grpc_service_config.json"; + Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); + Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); + assertTrue(serviceConfigOpt.isPresent()); + GapicServiceConfig serviceConfig = serviceConfigOpt.get(); + + GapicContext context = + GapicContext.builder() + .setMessages(messageTypes) + .setResourceNames(resourceNames) + .setServices(services) + .setHelperResourceNames(outputResourceNames) + .setTransport(Transport.GRPC) + .setServiceConfig(serviceConfig) + .build(); + + Service echoProtoService = services.get(0); + + GapicClass clazz = SpringPropertiesClassComposer.instance().generate(context, echoProtoService); + + JavaWriterVisitor visitor = new JavaWriterVisitor(); + clazz.classDefinition().accept(visitor); + // TODO: print out to check results for now. Need to convert to assert. + System.out.println(visitor.write()); + } + protected static final String EXPECTED_CLASS_STRING = "package com.google.showcase.v1beta1.spring;\n" + "\n" @@ -383,7 +421,7 @@ public void generateAutoConfigClasses() { + "@ConditionalOnClass(\"value = Echo\")\n" + "public class EchoSpringAutoConfiguration {\n" + " private final CredentialsProvider credentialsProvider;\n" - + " private final EchoProperties clientProperties;\n" + + " private final EchoSpringProperties clientProperties;\n" + " private final GcpProjectIdProvider projectIdProvider;\n" + " private static final ImmutableMap RETRY_PARAM_DEFINITIONS;\n" + "\n" @@ -398,7 +436,7 @@ public void generateAutoConfigClasses() { + " protected EchoSpringAutoConfiguration(\n" + " CredentialsProvider coreCredentialsProvider,\n" + " GcpProjectIdProvider coreProjectIdProvider,\n" - + " EchoProperties clientProperties)\n" + + " EchoSpringProperties clientProperties)\n" + " throws IOException {\n" + " this.clientProperties = clientProperties;\n" + " if (clientProperties.getCredentials().hasKey()) {\n" From 5882774cb783abb77e79548152002267ce674d4d Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 23 Aug 2022 20:50:02 +0000 Subject: [PATCH 013/103] added class annotation and interface to SpringProperties class. Also adding todo notes as reminder to revisit. --- .../SpringPropertiesClassComposer.java | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java index 8a942871b0..2fe41c535a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java @@ -72,6 +72,16 @@ public GapicClass generate(GapicContext context, Service service) { GapicServiceConfig gapicServiceConfig = context.serviceConfig(); Map types = createDynamicTypes(service, packageName); + // TODO: this is the prefix user will use to set properties, may need to change depending on + // branding. + AnnotationNode classAnnotationNode = + AnnotationNode.builder() + .setType(types.get("ConfigurationProperties")) + .setDescription( + "google.cloud.spring.autoconfig." + + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name())) + .build(); + ClassDefinition classDef = ClassDefinition.builder() .setPackageString(packageName) @@ -79,6 +89,8 @@ public GapicClass generate(GapicContext context, Service service) { .setScope(ScopeNode.PUBLIC) .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) .setMethods(createGetterSetters(service, types, gapicServiceConfig)) + .setAnnotations(Arrays.asList(classAnnotationNode)) + .setImplementsTypes(Arrays.asList(types.get("CredentialsSupplier"))) .build(); return GapicClass.create(Kind.MAIN, classDef); // return null; @@ -141,6 +153,7 @@ private static List createMemberVariables( .map(x -> ValueExpr.withValue(StringObjectValue.withValue(x))) .collect(Collectors.toList())) .build(); + // TODO: credentials field needs annotation. ExprStatement credentialsStatement = createMemberVarStatement( "credentials", types.get("Credentials"), true, defaultCredentialScopes); @@ -193,9 +206,9 @@ private static List createMemberVariables( List statements = retrySettings.stream().map(x -> (Statement) x).collect(Collectors.toList()); - statements.add(credentialsStatement); - statements.add(quotaProjectIdVarStatement); - statements.add(executorThreadCountVarStatement); + statements.add(0, executorThreadCountVarStatement); + statements.add(0, quotaProjectIdVarStatement); + statements.add(0, credentialsStatement); return statements; } @@ -324,6 +337,29 @@ private static Map createDynamicTypes(Service service, String .setPakkage("com.google.cloud.spring.core") .build()); + // import com.google.cloud.spring.core.CredentialsSupplier; + TypeNode credentialsSupplier = + TypeNode.withReference( + VaporReference.builder() + .setName("CredentialsSupplier") + .setPakkage("com.google.cloud.spring.core") + .build()); + // import org.springframework.boot.context.properties.ConfigurationProperties; + TypeNode configurationProperties = + TypeNode.withReference( + VaporReference.builder() + .setName("ConfigurationProperties") + .setPakkage("org.springframework.boot.context.properties") + .build()); + + // import org.springframework.boot.context.properties.NestedConfigurationProperty; + TypeNode nestedConfigurationProperty = + TypeNode.withReference( + VaporReference.builder() + .setName("NestedConfigurationProperty") + .setPakkage("org.springframework.boot.context.properties") + .build()); + // import org.threeten.bp.Duration; TypeNode duration = TypeNode.withReference( @@ -332,6 +368,9 @@ private static Map createDynamicTypes(Service service, String typeMap.put(service.name() + "Properties", clientProperties); typeMap.put("Credentials", credentials); typeMap.put("Duration", duration); + typeMap.put("CredentialsSupplier", credentialsSupplier); + typeMap.put("ConfigurationProperties", configurationProperties); + typeMap.put("NestedConfigurationProperty", nestedConfigurationProperty); return typeMap; } From 05befebf1e079928762f438228787337d9607461 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 24 Aug 2022 19:44:26 +0000 Subject: [PATCH 014/103] come code cleanups and added 2 more needed class annotations.- with pending to do after annotation feature in. --- .../SpringAutoConfigClassComposer.java | 191 ++++++++++-------- .../SpringAutoConfigClassComposerTest.java | 6 +- 2 files changed, 116 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 2eae0698ed..07052ac319 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -14,17 +14,7 @@ package com.google.api.generator.gapic.composer; -import com.google.api.gax.core.BackgroundResource; -import com.google.api.gax.core.BackgroundResourceAggregation; -import com.google.api.gax.grpc.GrpcCallSettings; -import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.retrying.RetrySettings; -import com.google.api.gax.rpc.BidiStreamingCallable; -import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.ClientStreamingCallable; -import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.ServerStreamingCallable; -import com.google.api.gax.rpc.UnaryCallable; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; @@ -51,6 +41,7 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.common.ClassComposer; import com.google.api.generator.gapic.composer.common.RetrySettingsComposer; +import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; @@ -58,16 +49,11 @@ import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableMap; -import com.google.longrunning.Operation; -import com.google.longrunning.stub.GrpcOperationsStub; -import io.grpc.MethodDescriptor; -import io.grpc.protobuf.ProtoUtils; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import javax.annotation.Generated; @@ -79,7 +65,7 @@ public class SpringAutoConfigClassComposer implements ClassComposer { private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); - private static final Map staticTypes = createStaticTypes(); + private static final Map STATIC_TYPES = createStaticTypes(); private static final VariableExpr NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR = createNestedRetryParamDefinitionsVarExpr(); @@ -139,8 +125,9 @@ public GapicClass generate(GapicContext context, Service service) { .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) .setMethods( Arrays.asList( - createConstructor(service.name(), className, types), createBeanMethod(service))) - .setAnnotations(createClassAnnotations(service.name())) + createConstructor(service.name(), className, types), + createBeanMethod(service, types))) + .setAnnotations(createClassAnnotations(service, types)) .build(); return GapicClass.create(kind, classDef); } @@ -151,7 +138,7 @@ private static VariableExpr createNestedRetryParamDefinitionsVarExpr() { ConcreteReference.builder() .setClazz(ImmutableMap.class) .setGenerics( - Arrays.asList(TypeNode.STRING, staticTypes.get("RetrySettings")).stream() + Arrays.asList(TypeNode.STRING, STATIC_TYPES.get("RetrySettings")).stream() .map(t -> t.reference()) .collect(Collectors.toList())) .build()); @@ -430,62 +417,54 @@ private static MethodDefinition createConstructor( .build(); } - private static List createClassAnnotations(String serviceName) { - TypeNode conditionalOnPropertyType = - TypeNode.withReference( - VaporReference.builder() - .setName("ConditionalOnProperty") - .setPakkage("org.springframework.boot.autoconfigure.condition") - .build()); - TypeNode conditionalOnClass = - TypeNode.withReference( - VaporReference.builder() - .setName("ConditionalOnClass") - .setPakkage("org.springframework.boot.autoconfigure.condition") - .build()); + private static List createClassAnnotations( + Service service, Map types) { + // @Generated("by gapic-generator-java") + // @Configuration(proxyBeanMethods = false) + // @ConditionalOnClass(LanguageServiceClient.class) + // @ConditionalOnProperty(value = "spring.cloud.gcp.language.enabled", matchIfMissing = true) + // @EnableConfigurationProperties(LanguageProperties.class) // TODO: AnnotationNode description only accepts String for now. need to extend to params // and classes. AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() - .setType(conditionalOnPropertyType) + .setType(types.get("ConditionalOnProperty")) .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") .build(); AnnotationNode conditionalOnClassNode = AnnotationNode.builder() - .setType(conditionalOnClass) - .setDescription("value = " + serviceName) // need to produce XXX.class + .setType(types.get("ConditionalOnClass")) + .setDescription( + "value = " + + ClassNames.getServiceClientClassName(service) + + ".class") // TODO: change after annotation feature merged. need to produce + // XXX.class + .build(); + AnnotationNode configurationNode = + AnnotationNode.builder() + .setType(types.get("Configuration")) + .setDescription("proxyBeanMethods = false") // TODO: change to parameters + .build(); + AnnotationNode enableConfigurationPropertiesNode = + AnnotationNode.builder() + .setType(types.get("EnableConfigurationProperties")) + .setDescription( + types.get(service.name() + "Properties").reference().name() + + ".Class") // TODO: change to parameters .build(); return Arrays.asList( AnnotationNode.builder() - .setType(staticTypes.get("Generated")) + .setType(STATIC_TYPES.get("Generated")) .setDescription("by gapic-generator-java") .build(), + configurationNode, + conditionalOnClassNode, conditionalOnPropertyNode, - conditionalOnClassNode); + enableConfigurationPropertiesNode); } - private static MethodDefinition createBeanMethod(Service service) { - // annotation types - TypeNode beanAnnotationType = - TypeNode.withReference( - VaporReference.builder() - .setName("Bean") - .setPakkage("org.springframework.context.annotation") - .build()); - TypeNode conditionalOnMissingBeanType = - TypeNode.withReference( - VaporReference.builder() - .setName("ConditionalOnMissingBean") - .setPakkage("org.springframework.boot.autoconfigure.condition") - .build()); - // client type - TypeNode clientType = - TypeNode.withReference( - VaporReference.builder() - .setName(service.name() + "Client") - .setPakkage(service.pakkage()) - .build()); + private static MethodDefinition createBeanMethod(Service service, Map types) { // build expressions MethodInvocationExpr lhsExpr = MethodInvocationExpr.builder() @@ -493,8 +472,8 @@ private static MethodDefinition createBeanMethod(Service service) { // read more in client composer: // src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java#L277-L292 .setMethodName("create") - .setStaticReferenceType(clientType) - .setReturnType(clientType) + .setStaticReferenceType(types.get("ServiceClient")) + .setReturnType(types.get("ServiceClient")) .build(); String methodName = @@ -502,11 +481,11 @@ private static MethodDefinition createBeanMethod(Service service) { return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) - .setReturnType(clientType) + .setReturnType(types.get("ServiceClient")) .setAnnotations( Arrays.asList( - AnnotationNode.withType(beanAnnotationType), - AnnotationNode.withType(conditionalOnMissingBeanType))) + AnnotationNode.withType(types.get("Bean")), + AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .setReturnExpr(lhsExpr) .build(); @@ -515,24 +494,24 @@ private static MethodDefinition createBeanMethod(Service service) { private static Map createStaticTypes() { List concreteClazzes = Arrays.asList( - BackgroundResource.class, - BackgroundResourceAggregation.class, - BidiStreamingCallable.class, - ClientContext.class, - ClientStreamingCallable.class, + // BackgroundResource.class, + // BackgroundResourceAggregation.class, + // BidiStreamingCallable.class, + // ClientContext.class, + // ClientStreamingCallable.class, Generated.class, - GrpcCallSettings.class, - GrpcOperationsStub.class, - GrpcStubCallableFactory.class, - InterruptedException.class, - IOException.class, - MethodDescriptor.class, - Operation.class, - OperationCallable.class, - ProtoUtils.class, - ServerStreamingCallable.class, - TimeUnit.class, - UnaryCallable.class, + // GrpcCallSettings.class, + // GrpcOperationsStub.class, + // GrpcStubCallableFactory.class, + // InterruptedException.class, + // IOException.class, + // MethodDescriptor.class, + // Operation.class, + // OperationCallable.class, + // ProtoUtils.class, + // ServerStreamingCallable.class, + // TimeUnit.class, + // UnaryCallable.class, RetrySettings.class); return concreteClazzes.stream() .collect( @@ -596,11 +575,63 @@ private static Map createDynamicTypes(Service service, String .build()) .build()); + TypeNode serviceClient = + TypeNode.withReference( + VaporReference.builder() + .setName(ClassNames.getServiceClientClassName(service)) + .setPakkage(service.pakkage()) + .build()); + + TypeNode bean = + TypeNode.withReference( + VaporReference.builder() + .setName("Bean") + .setPakkage("org.springframework.context.annotation") + .build()); + TypeNode configuration = + TypeNode.withReference( + VaporReference.builder() + .setName("Configuration") + .setPakkage("org.springframework.context.annotation") + .build()); + TypeNode enableConfigurationProperties = + TypeNode.withReference( + VaporReference.builder() + .setName("EnableConfigurationProperties") + .setPakkage("org.springframework.boot.context.properties") + .build()); + TypeNode conditionalOnMissingBean = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnMissingBean") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + + TypeNode conditionalOnProperty = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnProperty") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + TypeNode conditionalOnClass = + TypeNode.withReference( + VaporReference.builder() + .setName("ConditionalOnClass") + .setPakkage("org.springframework.boot.autoconfigure.condition") + .build()); + typeMap.put("CredentialsProvider", credentialsProvider); typeMap.put(service.name() + "Properties", clientProperties); typeMap.put("GcpProjectIdProvider", gcpProjectIdProvider); typeMap.put("Credentials", credentials); typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); + typeMap.put("ServiceClient", serviceClient); + typeMap.put("Bean", bean); + typeMap.put("Configuration", configuration); + typeMap.put("EnableConfigurationProperties", enableConfigurationProperties); + typeMap.put("ConditionalOnMissingBean", conditionalOnMissingBean); + typeMap.put("ConditionalOnProperty", conditionalOnProperty); + typeMap.put("ConditionalOnClass", conditionalOnClass); return typeMap; } diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index c2b334ded3..df610e4e4c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -414,11 +414,15 @@ public void generatePropertiesTest() { + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + + "import org.springframework.boot.context.properties.EnableConfigurationProperties;\n" + "import org.springframework.context.annotation.Bean;\n" + + "import org.springframework.context.annotation.Configuration;\n" + "\n" + "@Generated(\"by gapic-generator-java\")\n" + + "@Configuration(\"proxyBeanMethods = false\")\n" + + "@ConditionalOnClass(\"value = EchoClient.class\")\n" + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" - + "@ConditionalOnClass(\"value = Echo\")\n" + + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + "public class EchoSpringAutoConfiguration {\n" + " private final CredentialsProvider credentialsProvider;\n" + " private final EchoSpringProperties clientProperties;\n" From 1d16132d07d4a5f1d5be058c82309b50565966c0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 24 Aug 2022 20:07:27 +0000 Subject: [PATCH 015/103] comment out not needed code for constructor. --- .../SpringAutoConfigClassComposer.java | 377 +++++++++--------- .../SpringAutoConfigClassComposerTest.java | 46 ++- 2 files changed, 207 insertions(+), 216 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 07052ac319..5ec1ef89ef 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -19,18 +19,13 @@ import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; import com.google.api.generator.engine.ast.BlockStatement; -import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; 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.ExprStatement; -import com.google.api.generator.engine.ast.IfStatement; -import com.google.api.generator.engine.ast.LambdaExpr; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; -import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.ThisObjectValue; @@ -50,7 +45,6 @@ import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableMap; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -154,21 +148,22 @@ private static List createMemberVariables( GapicServiceConfig serviceConfig) { String serviceName = service.name(); - // private final CredentialsProvider credentialsProvider; - Variable credentialsProviderVar = - Variable.builder() - .setName("credentialsProvider") - .setType(types.get("CredentialsProvider")) - .build(); - VariableExpr credentialsProviderVarExpr = - VariableExpr.builder() - .setVariable(credentialsProviderVar) - .setScope(ScopeNode.PRIVATE) - .setIsFinal(true) - .setIsDecl(true) - .build(); - ExprStatement credentialsProviderVarStatement = - ExprStatement.withExpr(credentialsProviderVarExpr); + // TODO create CredentialsProvider bean instead. + // // private final CredentialsProvider credentialsProvider; + // Variable credentialsProviderVar = + // Variable.builder() + // .setName("credentialsProvider") + // .setType(types.get("CredentialsProvider")) + // .build(); + // VariableExpr credentialsProviderVarExpr = + // VariableExpr.builder() + // .setVariable(credentialsProviderVar) + // .setScope(ScopeNode.PRIVATE) + // .setIsFinal(true) + // .setIsDecl(true) + // .build(); + // ExprStatement credentialsProviderVarStatement = + // ExprStatement.withExpr(credentialsProviderVarExpr); // private final LanguageProperties clientProperties; Variable clientPropertiesVar = @@ -185,20 +180,20 @@ private static List createMemberVariables( .build(); ExprStatement clientPropertiesStatement = ExprStatement.withExpr(clientPropertiesVarExpr); - // private final GcpProjectIdProvider projectIdProvider; - Variable projectIdProviderVar = - Variable.builder() - .setName("projectIdProvider") - .setType(types.get("GcpProjectIdProvider")) - .build(); - VariableExpr projectIdProviderVarExpr = - VariableExpr.builder() - .setVariable(projectIdProviderVar) - .setScope(ScopeNode.PRIVATE) - .setIsFinal(true) - .setIsDecl(true) - .build(); - ExprStatement projectIdProviderStatement = ExprStatement.withExpr(projectIdProviderVarExpr); + // // private final GcpProjectIdProvider projectIdProvider; + // Variable projectIdProviderVar = + // Variable.builder() + // .setName("projectIdProvider") + // .setType(types.get("GcpProjectIdProvider")) + // .build(); + // VariableExpr projectIdProviderVarExpr = + // VariableExpr.builder() + // .setVariable(projectIdProviderVar) + // .setScope(ScopeNode.PRIVATE) + // .setIsFinal(true) + // .setIsDecl(true) + // .build(); + // ExprStatement projectIdProviderStatement = ExprStatement.withExpr(projectIdProviderVarExpr); // Declare the RETRY_PARAM_DEFINITIONS map. ExprStatement retryPramStatement = @@ -215,30 +210,25 @@ private static List createMemberVariables( RetrySettingsComposer.createRetryParamDefinitionsBlock( service, serviceConfig, NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR); - return Arrays.asList( - credentialsProviderVarStatement, - clientPropertiesStatement, - projectIdProviderStatement, - retryPramStatement, - retryParamDefinitionsBlock); + return Arrays.asList(clientPropertiesStatement, retryPramStatement, retryParamDefinitionsBlock); } private static MethodDefinition createConstructor( String serviceName, String className, Map types) { /// constructor - VariableExpr credentialsProviderBuilderVarExpr = - VariableExpr.withVariable( - Variable.builder() - .setName("coreCredentialsProvider") - .setType(types.get("CredentialsProvider")) - .build()); - - VariableExpr coreProjectIdProviderVarExpr = - VariableExpr.withVariable( - Variable.builder() - .setName("coreProjectIdProvider") - .setType(types.get("GcpProjectIdProvider")) - .build()); + // VariableExpr credentialsProviderBuilderVarExpr = + // VariableExpr.withVariable( + // Variable.builder() + // .setName("coreCredentialsProvider") + // .setType(types.get("CredentialsProvider")) + // .build()); + // + // VariableExpr coreProjectIdProviderVarExpr = + // VariableExpr.withVariable( + // Variable.builder() + // .setName("coreProjectIdProvider") + // .setType(types.get("GcpProjectIdProvider")) + // .build()); VariableExpr propertiesVarExpr = VariableExpr.withVariable( @@ -246,11 +236,11 @@ private static MethodDefinition createConstructor( .setName("clientProperties") .setType(types.get(serviceName + "Properties")) .build()); - Variable projectIdProviderVar = - Variable.builder() - .setName("projectIdProvider") - .setType(types.get("GcpProjectIdProvider")) - .build(); + // Variable projectIdProviderVar = + // Variable.builder() + // .setName("projectIdProvider") + // .setType(types.get("GcpProjectIdProvider")) + // .build(); Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") @@ -272,148 +262,147 @@ private static MethodDefinition createConstructor( ExprStatement thisPropertiesAssignmentStatement = ExprStatement.withExpr(thisPropertiesAssignmentExpr); - /** - * if (properties.getCredentials().hasKey()) { this.credentialsProvider = new - * DefaultCredentialsProvider(properties); } else { this.credentialsProvider = - * coreCredentialsProvider; } - */ - - // expr: properties.getCredentials().hasKey() - - MethodInvocationExpr getCredentialsExpr = - MethodInvocationExpr.builder() - .setMethodName("getCredentials") - .setExprReferenceExpr(propertiesVarExpr) - .setReturnType(types.get("Credentials")) - .build(); - MethodInvocationExpr hasKeyExpr = - MethodInvocationExpr.builder() - .setMethodName("hasKey") - .setExprReferenceExpr(getCredentialsExpr) - .setReturnType(TypeNode.BOOLEAN) - .build(); - - // if body: this.credentialsProvider = new DefaultCredentialsProvider(properties) - CastExpr castExpr = - CastExpr.builder() - .setExpr( - NewObjectExpr.builder() - .setType(types.get("DefaultCredentialsProvider")) - .setArguments(propertiesVarExpr) - .build()) - .setType(types.get("CredentialsProvider")) - .build(); - Variable credentialsProviderVar = - Variable.builder() - .setName("credentialsProvider") - .setType(types.get("CredentialsProvider")) - .build(); - AssignmentExpr credentialsProviderssignExpr = - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(credentialsProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr(castExpr) - .build(); - - // else body: this.credentialsProvider = coreCredentialsProvider; - List coreCredentialsProviderAssignmentExprs = new ArrayList<>(); - coreCredentialsProviderAssignmentExprs.add( - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(credentialsProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr( - CastExpr.builder() - .setExpr(coreProjectIdProviderVarExpr) - .setType(types.get("CredentialsProvider")) - .build()) - .build()); - - IfStatement credentialIfStatement = - IfStatement.builder() - .setConditionExpr(hasKeyExpr) - .setBody(Arrays.asList(ExprStatement.withExpr(credentialsProviderssignExpr))) - .setElseBody( - coreCredentialsProviderAssignmentExprs.stream() - .map(e -> ExprStatement.withExpr(e)) - .collect(Collectors.toList())) - .build(); - - /** - * if (clientProperties.getProjectId() != null) { this.projectIdProvider = - * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } - */ - // else body: this.projectIdProvider = coreProjectIdProvider; - List ctorAssignmentExprs = new ArrayList<>(); - ctorAssignmentExprs.add( - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(projectIdProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr(coreProjectIdProviderVarExpr) - .build()); - - // expr: clientProperties.getProjectId() != null - MethodInvocationExpr getProjectIdExpr = - MethodInvocationExpr.builder() - .setMethodName("getProjectId") - .setExprReferenceExpr( - VariableExpr.withVariable(clientPropertiesVar).toBuilder().build()) - // .setStaticReferenceType(clientType) - .setReturnType(types.get("CredentialsProvider")) // fake it - .build(); - RelationalOperationExpr notEqualSentence = - RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); - - // () -> clientProperties.getProjectId(); - LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); - - // this.projectIdProvider = () -> clientProperties.getProjectId(); - AssignmentExpr projectIdProviderAssignExpr = - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(projectIdProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr( - CastExpr.builder() - .setExpr(lambdaExpr) - .setType(types.get("GcpProjectIdProvider")) - .build()) - .build(); - - IfStatement projectIdProviderIfStatement = - IfStatement.builder() - .setConditionExpr(notEqualSentence) - .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) - .setElseBody( - ctorAssignmentExprs.stream() - .map(e -> ExprStatement.withExpr(e)) - .collect(Collectors.toList())) - .build(); + // /** + // * if (properties.getCredentials().hasKey()) { this.credentialsProvider = new + // * DefaultCredentialsProvider(properties); } else { this.credentialsProvider = + // * coreCredentialsProvider; } + // */ + // + // // expr: properties.getCredentials().hasKey() + // + // MethodInvocationExpr getCredentialsExpr = + // MethodInvocationExpr.builder() + // .setMethodName("getCredentials") + // .setExprReferenceExpr(propertiesVarExpr) + // .setReturnType(types.get("Credentials")) + // .build(); + // MethodInvocationExpr hasKeyExpr = + // MethodInvocationExpr.builder() + // .setMethodName("hasKey") + // .setExprReferenceExpr(getCredentialsExpr) + // .setReturnType(TypeNode.BOOLEAN) + // .build(); + // + // // if body: this.credentialsProvider = new DefaultCredentialsProvider(properties) + // CastExpr castExpr = + // CastExpr.builder() + // .setExpr( + // NewObjectExpr.builder() + // .setType(types.get("DefaultCredentialsProvider")) + // .setArguments(propertiesVarExpr) + // .build()) + // .setType(types.get("CredentialsProvider")) + // .build(); + // Variable credentialsProviderVar = + // Variable.builder() + // .setName("credentialsProvider") + // .setType(types.get("CredentialsProvider")) + // .build(); + // AssignmentExpr credentialsProviderssignExpr = + // AssignmentExpr.builder() + // .setVariableExpr( + // VariableExpr.withVariable(credentialsProviderVar) + // .toBuilder() + // .setExprReferenceExpr(thisExpr) + // .build()) + // .setValueExpr(castExpr) + // .build(); + // + // // else body: this.credentialsProvider = coreCredentialsProvider; + // List coreCredentialsProviderAssignmentExprs = new ArrayList<>(); + // coreCredentialsProviderAssignmentExprs.add( + // AssignmentExpr.builder() + // .setVariableExpr( + // VariableExpr.withVariable(credentialsProviderVar) + // .toBuilder() + // .setExprReferenceExpr(thisExpr) + // .build()) + // .setValueExpr( + // CastExpr.builder() + // .setExpr(coreProjectIdProviderVarExpr) + // .setType(types.get("CredentialsProvider")) + // .build()) + // .build()); + // + // IfStatement credentialIfStatement = + // IfStatement.builder() + // .setConditionExpr(hasKeyExpr) + // .setBody(Arrays.asList(ExprStatement.withExpr(credentialsProviderssignExpr))) + // .setElseBody( + // coreCredentialsProviderAssignmentExprs.stream() + // .map(e -> ExprStatement.withExpr(e)) + // .collect(Collectors.toList())) + // .build(); + // + // /** + // * if (clientProperties.getProjectId() != null) { this.projectIdProvider = + // * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } + // */ + // // else body: this.projectIdProvider = coreProjectIdProvider; + // List ctorAssignmentExprs = new ArrayList<>(); + // ctorAssignmentExprs.add( + // AssignmentExpr.builder() + // .setVariableExpr( + // VariableExpr.withVariable(projectIdProviderVar) + // .toBuilder() + // .setExprReferenceExpr(thisExpr) + // .build()) + // .setValueExpr(coreProjectIdProviderVarExpr) + // .build()); + // + // // expr: clientProperties.getProjectId() != null + // MethodInvocationExpr getProjectIdExpr = + // MethodInvocationExpr.builder() + // .setMethodName("getProjectId") + // .setExprReferenceExpr( + // VariableExpr.withVariable(clientPropertiesVar).toBuilder().build()) + // // .setStaticReferenceType(clientType) + // .setReturnType(types.get("CredentialsProvider")) // fake it + // .build(); + // RelationalOperationExpr notEqualSentence = + // RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, + // ValueExpr.createNullExpr()); + // + // // () -> clientProperties.getProjectId(); + // LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); + // + // // this.projectIdProvider = () -> clientProperties.getProjectId(); + // AssignmentExpr projectIdProviderAssignExpr = + // AssignmentExpr.builder() + // .setVariableExpr( + // VariableExpr.withVariable(projectIdProviderVar) + // .toBuilder() + // .setExprReferenceExpr(thisExpr) + // .build()) + // .setValueExpr( + // CastExpr.builder() + // .setExpr(lambdaExpr) + // .setType(types.get("GcpProjectIdProvider")) + // .build()) + // .build(); + // + // IfStatement projectIdProviderIfStatement = + // IfStatement.builder() + // .setConditionExpr(notEqualSentence) + // .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) + // .setElseBody( + // ctorAssignmentExprs.stream() + // .map(e -> ExprStatement.withExpr(e)) + // .collect(Collectors.toList())) + // .build(); return MethodDefinition.constructorBuilder() .setScope(ScopeNode.PROTECTED) .setReturnType(types.get(className)) .setArguments( Arrays.asList( - credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), - coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build(), + // credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), + // coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build(), propertiesVarExpr.toBuilder().setIsDecl(true).build())) - .setBody( - Arrays.asList( - thisPropertiesAssignmentStatement, - credentialIfStatement, - projectIdProviderIfStatement)) - .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + .setBody(Arrays.asList(thisPropertiesAssignmentStatement)) + // credentialIfStatement, + // projectIdProviderIfStatement)) + // .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .build(); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index df610e4e4c..d95c2c0e58 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -402,11 +402,11 @@ public void generatePropertiesTest() { protected static final String EXPECTED_CLASS_STRING = "package com.google.showcase.v1beta1.spring;\n" + "\n" - + "import com.google.api.gax.core.CredentialsProvider;\n" + // + "import com.google.api.gax.core.CredentialsProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" - + "import com.google.cloud.spring.core.Credentials;\n" - + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" - + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + // + "import com.google.cloud.spring.core.Credentials;\n" + // + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" + // + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import java.io.IOException;\n" @@ -424,9 +424,9 @@ public void generatePropertiesTest() { + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + "public class EchoSpringAutoConfiguration {\n" - + " private final CredentialsProvider credentialsProvider;\n" + // + " private final CredentialsProvider credentialsProvider;\n" + " private final EchoSpringProperties clientProperties;\n" - + " private final GcpProjectIdProvider projectIdProvider;\n" + // + " private final GcpProjectIdProvider projectIdProvider;\n" + " private static final ImmutableMap RETRY_PARAM_DEFINITIONS;\n" + "\n" + " static {\n" @@ -437,23 +437,25 @@ public void generatePropertiesTest() { + " RETRY_PARAM_DEFINITIONS = definitions.build();\n" + " }\n" + "\n" - + " protected EchoSpringAutoConfiguration(\n" - + " CredentialsProvider coreCredentialsProvider,\n" - + " GcpProjectIdProvider coreProjectIdProvider,\n" - + " EchoSpringProperties clientProperties)\n" - + " throws IOException {\n" + + " protected EchoSpringAutoConfiguration(" + // + " CredentialsProvider coreCredentialsProvider,\n" + // + " GcpProjectIdProvider coreProjectIdProvider,\n" + + "EchoSpringProperties clientProperties) {\n" + // + " throws IOException {\n" + " this.clientProperties = clientProperties;\n" - + " if (clientProperties.getCredentials().hasKey()) {\n" - + " this.credentialsProvider =\n" - + " ((CredentialsProvider) new DefaultCredentialsProvider(clientProperties));\n" - + " } else {\n" - + " this.credentialsProvider = ((CredentialsProvider) coreProjectIdProvider);\n" - + " }\n" - + " if (clientProperties.getProjectId() != null) {\n" - + " this.projectIdProvider = ((GcpProjectIdProvider) () -> clientProperties.getProjectId());\n" - + " } else {\n" - + " this.projectIdProvider = coreProjectIdProvider;\n" - + " }\n" + // + " if (clientProperties.getCredentials().hasKey()) {\n" + // + " this.credentialsProvider =\n" + // + " ((CredentialsProvider) new + // DefaultCredentialsProvider(clientProperties));\n" + // + " } else {\n" + // + " this.credentialsProvider = ((CredentialsProvider) coreProjectIdProvider);\n" + // + " }\n" + // + " if (clientProperties.getProjectId() != null) {\n" + // + " this.projectIdProvider = ((GcpProjectIdProvider) () -> + // clientProperties.getProjectId());\n" + // + " } else {\n" + // + " this.projectIdProvider = coreProjectIdProvider;\n" + // + " }\n" + " }\n" + "\n" + " @Bean\n" From 25f7bb8f4f0d96afe888bd42b7a060eacf1facd0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 24 Aug 2022 20:32:45 +0000 Subject: [PATCH 016/103] create CredentialsProvider Bean method. --- .../SpringAutoConfigClassComposer.java | 47 +++++++++++++++++++ .../SpringAutoConfigClassComposerTest.java | 10 +++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 5ec1ef89ef..5b67bc21d4 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -19,6 +19,7 @@ import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; import com.google.api.generator.engine.ast.BlockStatement; +import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.engine.ast.ConcreteReference; @@ -26,6 +27,7 @@ import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.NewObjectExpr; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.ThisObjectValue; @@ -120,6 +122,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods( Arrays.asList( createConstructor(service.name(), className, types), + createCredentialsProviderBeanMethod(service, className, types), createBeanMethod(service, types))) .setAnnotations(createClassAnnotations(service, types)) .build(); @@ -453,6 +456,50 @@ private static List createClassAnnotations( enableConfigurationPropertiesNode); } + private static MethodDefinition createCredentialsProviderBeanMethod( + Service service, String className, Map types) { + // @Bean + // @ConditionalOnMissingBean + // public CredentialsProvider googleCredentials() throws IOException { + // return new DefaultCredentialsProvider(this.clientProperties); + // } + + Variable clientPropertiesVar = + Variable.builder() + .setName("clientProperties") + .setType(types.get(service.name() + "Properties")) + .build(); + + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); + VariableExpr thisClientProperties = + VariableExpr.withVariable(clientPropertiesVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build(); + CastExpr castExpr = + CastExpr.builder() + .setExpr( + NewObjectExpr.builder() + .setType(types.get("DefaultCredentialsProvider")) + .setArguments(thisClientProperties) + .build()) + .setType(types.get("CredentialsProvider")) + .build(); + + String methodName = "googleCredentials"; + return MethodDefinition.builder() + .setName(methodName) + .setScope(ScopeNode.PUBLIC) + .setReturnType(types.get("CredentialsProvider")) + .setAnnotations( + Arrays.asList( + AnnotationNode.withType(types.get("Bean")), + AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) + .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) + .setReturnExpr(castExpr) + .build(); + } + private static MethodDefinition createBeanMethod(Service service, Map types) { // build expressions MethodInvocationExpr lhsExpr = diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index d95c2c0e58..a9cce8a40c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -402,10 +402,10 @@ public void generatePropertiesTest() { protected static final String EXPECTED_CLASS_STRING = "package com.google.showcase.v1beta1.spring;\n" + "\n" - // + "import com.google.api.gax.core.CredentialsProvider;\n" + + "import com.google.api.gax.core.CredentialsProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" // + "import com.google.cloud.spring.core.Credentials;\n" - // + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" + + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" // + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" @@ -460,6 +460,12 @@ public void generatePropertiesTest() { + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" + + " public CredentialsProvider googleCredentials() throws IOException {\n" + + " return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));\n" + + " }\n" + + "\n" + + " @Bean\n" + + " @ConditionalOnMissingBean\n" + " public EchoClient echoClient() throws IOException {\n" + " return EchoClient.create();\n" + " }\n" From 0643085e8e837f23d11b3bc18bded7e1551233ba Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 24 Aug 2022 22:02:10 +0000 Subject: [PATCH 017/103] create TransportChannelProvider Bean. --- .../SpringAutoConfigClassComposer.java | 41 ++++++++++++++++++- .../SpringAutoConfigClassComposerTest.java | 8 ++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 5b67bc21d4..b6a4ba6cae 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic.composer; import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.BlockComment; @@ -123,6 +124,7 @@ public GapicClass generate(GapicContext context, Service service) { Arrays.asList( createConstructor(service.name(), className, types), createCredentialsProviderBeanMethod(service, className, types), + createTransportChannelProviderBeanMethod(service, types), createBeanMethod(service, types))) .setAnnotations(createClassAnnotations(service, types)) .build(); @@ -500,6 +502,35 @@ private static MethodDefinition createCredentialsProviderBeanMethod( .build(); } + private static MethodDefinition createTransportChannelProviderBeanMethod( + Service service, Map types) { + + // @Bean + // @ConditionalOnMissingBean + // public TransportChannelProvider defaultLanguageTransportChannelProvider() { + // return LanguageServiceSettings.defaultTransportChannelProvider(); + // } + // build expressions + MethodInvocationExpr returnExpr = + MethodInvocationExpr.builder() + .setMethodName("defaultTransportChannelProvider") + .setStaticReferenceType(types.get("ServiceSettings")) + .setReturnType(STATIC_TYPES.get("TransportChannelProvider")) + .build(); + + String methodName = "default" + service.name() + "TransportChannelProvider"; + return MethodDefinition.builder() + .setName(methodName) + .setScope(ScopeNode.PUBLIC) + .setReturnType(STATIC_TYPES.get("TransportChannelProvider")) + .setAnnotations( + Arrays.asList( + AnnotationNode.withType(types.get("Bean")), + AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) + .setReturnExpr(returnExpr) + .build(); + } + private static MethodDefinition createBeanMethod(Service service, Map types) { // build expressions MethodInvocationExpr lhsExpr = @@ -548,7 +579,8 @@ private static Map createStaticTypes() { // ServerStreamingCallable.class, // TimeUnit.class, // UnaryCallable.class, - RetrySettings.class); + RetrySettings.class, + TransportChannelProvider.class); return concreteClazzes.stream() .collect( Collectors.toMap( @@ -617,6 +649,12 @@ private static Map createDynamicTypes(Service service, String .setName(ClassNames.getServiceClientClassName(service)) .setPakkage(service.pakkage()) .build()); + TypeNode serviceSettings = + TypeNode.withReference( + VaporReference.builder() + .setName(ClassNames.getServiceSettingsClassName(service)) + .setPakkage(service.pakkage()) + .build()); TypeNode bean = TypeNode.withReference( @@ -662,6 +700,7 @@ private static Map createDynamicTypes(Service service, String typeMap.put("Credentials", credentials); typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); typeMap.put("ServiceClient", serviceClient); + typeMap.put("ServiceSettings", serviceSettings); typeMap.put("Bean", bean); typeMap.put("Configuration", configuration); typeMap.put("EnableConfigurationProperties", enableConfigurationProperties); diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index a9cce8a40c..0c051c40e7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -404,11 +404,13 @@ public void generatePropertiesTest() { + "\n" + "import com.google.api.gax.core.CredentialsProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" + + "import com.google.api.gax.rpc.TransportChannelProvider;\n" // + "import com.google.cloud.spring.core.Credentials;\n" + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" // + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + + "import com.google.showcase.v1beta1.EchoSettings;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" @@ -466,6 +468,12 @@ public void generatePropertiesTest() { + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" + + " public TransportChannelProvider defaultEchoTransportChannelProvider() {\n" + + " return EchoSettings.defaultTransportChannelProvider();\n" + + " }\n" + + "\n" + + " @Bean\n" + + " @ConditionalOnMissingBean\n" + " public EchoClient echoClient() throws IOException {\n" + " return EchoClient.create();\n" + " }\n" From 697d89cbe240f0a67e5638ea79aac912c7911804 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 25 Aug 2022 18:28:05 +0000 Subject: [PATCH 018/103] building service client bean. Basic settings. --- .../SpringAutoConfigClassComposer.java | 128 +++++++++++++++++- .../SpringAutoConfigClassComposerTest.java | 12 +- 2 files changed, 133 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index b6a4ba6cae..0f69bd3539 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -48,6 +48,7 @@ import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableMap; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -125,7 +126,7 @@ public GapicClass generate(GapicContext context, Service service) { createConstructor(service.name(), className, types), createCredentialsProviderBeanMethod(service, className, types), createTransportChannelProviderBeanMethod(service, types), - createBeanMethod(service, types))) + createClientBeanMethod(service, types))) .setAnnotations(createClassAnnotations(service, types)) .build(); return GapicClass.create(kind, classDef); @@ -531,9 +532,108 @@ private static MethodDefinition createTransportChannelProviderBeanMethod( .build(); } - private static MethodDefinition createBeanMethod(Service service, Map types) { - // build expressions - MethodInvocationExpr lhsExpr = + private static MethodDefinition createClientBeanMethod( + Service service, Map types) { + // @Bean + // @ConditionalOnMissingBean + // public LanguageServiceClient languageServiceClient(CredentialsProvider credentialsProvider, + // TransportChannelProvider defaultTransportChannelProvider) + // throws IOException { + // + // LanguageServiceSettings.Builder clientSettingsBuilder = + // LanguageServiceSettings.newBuilder() + // .setCredentialsProvider(credentialsProvider) + // .setTransportChannelProvider(defaultTransportChannelProvider) + // .setHeaderProvider( + // new UserAgentHeaderProvider(this.getClass())); + // if (clientProperties.getQuotaProjectId() != null) { + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() + // + ", this overrides project id from credentials."); + // } + // + // if (clientProperties.getExecutorThreadCount() != null) { + // ExecutorProvider executorProvider = + // LanguageServiceSettings.defaultExecutorProviderBuilder() + // .setExecutorThreadCount(clientProperties.getExecutorThreadCount()).build(); + // clientSettingsBuilder + // .setBackgroundExecutorProvider(executorProvider); + // } + // if (clientProperties.isUseRest()) { + // clientSettingsBuilder.setTransportChannelProvider( + // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); + // } + + // argument variables: + VariableExpr credentialsProviderVariableExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("credentialsProvider") + .setType(types.get("CredentialsProvider")) + .build()); + VariableExpr transportChannelProviderVariableExpr = + VariableExpr.withVariable( + Variable.builder() + .setName("defaultTransportChannelProvider") + .setType(STATIC_TYPES.get("TransportChannelProvider")) + .build()); + + // LanguageServiceSettings.Builder clientSettingsBuilder = + // LanguageServiceSettings.newBuilder() + // .setCredentialsProvider(credentialsProvider) + // .setTransportChannelProvider(defaultTransportChannelProvider) + // .setHeaderProvider( + // new UserAgentHeaderProvider(this.getClass())); + Variable settingBuilderVariable = + Variable.builder() + .setName("clientSettingsBuilder") + .setType(types.get("ServiceSettingsBuilder")) + .build(); + VariableExpr settingsVarExpr = + VariableExpr.withVariable(settingBuilderVariable).toBuilder().setIsDecl(true).build(); + Expr settingsBuilderExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(types.get("ServiceSettings")) + .setMethodName("newBuilder") + .build(); + + settingsBuilderExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(settingsBuilderExpr) + .setMethodName("setCredentialsProvider") + .setArguments(credentialsProviderVariableExpr) + .build(); + // .setTransportChannelProvider(defaultTransportChannelProvider) + settingsBuilderExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(settingsBuilderExpr) + .setMethodName("setTransportChannelProvider") + .setArguments(transportChannelProviderVariableExpr) + .build(); + // .setHeaderProvider( + // new UserAgentHeaderProvider(this.getClass())); + settingsBuilderExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(settingsBuilderExpr) + .setMethodName("setHeaderProvider") + // .setArguments() //TODO add augument here to create new obj. Caveat: decide where to + // UserAgentHeaderProvider class first. + .setReturnType(settingBuilderVariable.type()) + .build(); + AssignmentExpr settingCreateExpr = + AssignmentExpr.builder() + .setVariableExpr(settingsVarExpr) + .setValueExpr(settingsBuilderExpr) + .build(); + + // return expressions + MethodInvocationExpr serviceSettingsBuilt = + MethodInvocationExpr.builder() + .setMethodName("build") + .setExprReferenceExpr(settingsVarExpr.toBuilder().setIsDecl(false).build()) + .setReturnType(types.get("ServiceSettings")) + .build(); + MethodInvocationExpr returnExpr = MethodInvocationExpr.builder() // TODO: might need to use newBuilder().build() if options needed. // read more in client composer: @@ -541,20 +641,30 @@ private static MethodDefinition createBeanMethod(Service service, Map bodyExprs = new ArrayList<>(); + bodyExprs.add(settingCreateExpr); return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) + .setArguments( + Arrays.asList( + credentialsProviderVariableExpr.toBuilder().setIsDecl(true).build(), + transportChannelProviderVariableExpr.toBuilder().setIsDecl(true).build())) .setAnnotations( Arrays.asList( AnnotationNode.withType(types.get("Bean")), AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) - .setReturnExpr(lhsExpr) + .setReturnExpr(returnExpr) + .setBody( + bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList())) .build(); } @@ -655,6 +765,13 @@ private static Map createDynamicTypes(Service service, String .setName(ClassNames.getServiceSettingsClassName(service)) .setPakkage(service.pakkage()) .build()); + TypeNode serviceSettingsBuilder = + TypeNode.withReference( + VaporReference.builder() + .setPakkage(service.pakkage()) + .setName("Builder") + .setEnclosingClassNames(ClassNames.getServiceSettingsClassName(service)) + .build()); TypeNode bean = TypeNode.withReference( @@ -701,6 +818,7 @@ private static Map createDynamicTypes(Service service, String typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); typeMap.put("ServiceClient", serviceClient); typeMap.put("ServiceSettings", serviceSettings); + typeMap.put("ServiceSettingsBuilder", serviceSettingsBuilder); typeMap.put("Bean", bean); typeMap.put("Configuration", configuration); typeMap.put("EnableConfigurationProperties", enableConfigurationProperties); diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 0c051c40e7..81b046b7de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -474,8 +474,16 @@ public void generatePropertiesTest() { + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" - + " public EchoClient echoClient() throws IOException {\n" - + " return EchoClient.create();\n" + + " public EchoClient echoClient(\n" + + " CredentialsProvider credentialsProvider,\n" + + " TransportChannelProvider defaultTransportChannelProvider)\n" + + " throws IOException {\n" + + " EchoSettings.Builder clientSettingsBuilder =\n" + + " EchoSettings.newBuilder()\n" + + " .setCredentialsProvider(credentialsProvider)\n" + + " .setTransportChannelProvider(defaultTransportChannelProvider)\n" + + " .setHeaderProvider();\n" + + " return EchoClient.create(clientSettingsBuilder.build());\n" + " }\n" + "}\n"; } From 71b66e6b7986a76c5287ba8d31962eeb6f4ef67c Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 25 Aug 2022 22:17:39 +0000 Subject: [PATCH 019/103] added 2 if statements and todo comments to service client bean. --- .../SpringAutoConfigClassComposer.java | 184 +++++++++++++----- .../SpringPropertiesClassComposer.java | 2 + .../SpringAutoConfigClassComposerTest.java | 11 ++ 3 files changed, 144 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 0f69bd3539..97ad468c16 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -14,6 +14,7 @@ package com.google.api.generator.gapic.composer; +import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; @@ -26,9 +27,11 @@ import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; +import com.google.api.generator.engine.ast.IfStatement; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.ThisObjectValue; @@ -126,7 +129,7 @@ public GapicClass generate(GapicContext context, Service service) { createConstructor(service.name(), className, types), createCredentialsProviderBeanMethod(service, className, types), createTransportChannelProviderBeanMethod(service, types), - createClientBeanMethod(service, types))) + createClientBeanMethod(service, className, types))) .setAnnotations(createClassAnnotations(service, types)) .build(); return GapicClass.create(kind, classDef); @@ -532,37 +535,18 @@ private static MethodDefinition createTransportChannelProviderBeanMethod( .build(); } + private static IfStatement createIfStatement( + Expr conditionExpr, List ifBody, List elseBody) { + IfStatement.Builder credentialIfStatement = + IfStatement.builder().setConditionExpr(conditionExpr).setBody(ifBody); + if (elseBody != null) { + credentialIfStatement.setElseBody(elseBody); + } + return credentialIfStatement.build(); + } + private static MethodDefinition createClientBeanMethod( - Service service, Map types) { - // @Bean - // @ConditionalOnMissingBean - // public LanguageServiceClient languageServiceClient(CredentialsProvider credentialsProvider, - // TransportChannelProvider defaultTransportChannelProvider) - // throws IOException { - // - // LanguageServiceSettings.Builder clientSettingsBuilder = - // LanguageServiceSettings.newBuilder() - // .setCredentialsProvider(credentialsProvider) - // .setTransportChannelProvider(defaultTransportChannelProvider) - // .setHeaderProvider( - // new UserAgentHeaderProvider(this.getClass())); - // if (clientProperties.getQuotaProjectId() != null) { - // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); - // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() - // + ", this overrides project id from credentials."); - // } - // - // if (clientProperties.getExecutorThreadCount() != null) { - // ExecutorProvider executorProvider = - // LanguageServiceSettings.defaultExecutorProviderBuilder() - // .setExecutorThreadCount(clientProperties.getExecutorThreadCount()).build(); - // clientSettingsBuilder - // .setBackgroundExecutorProvider(executorProvider); - // } - // if (clientProperties.isUseRest()) { - // clientSettingsBuilder.setTransportChannelProvider( - // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); - // } + Service service, String className, Map types) { // argument variables: VariableExpr credentialsProviderVariableExpr = @@ -626,6 +610,114 @@ private static MethodDefinition createClientBeanMethod( .setValueExpr(settingsBuilderExpr) .build(); + // if (this.clientProperties.getQuotaProjectId() != null) { + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() + // + ", this overrides project id from credentials."); + // } + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); + Variable clientPropertiesVar = + Variable.builder() + .setName("clientProperties") + .setType(types.get(service.name() + "Properties")) + .build(); + + VariableExpr thisClientPropertiesVarExpr = + VariableExpr.withVariable(clientPropertiesVar) + .toBuilder() + .setExprReferenceExpr(thisExpr) + .build(); + MethodInvocationExpr getQuotaProjectId = + MethodInvocationExpr.builder() + .setMethodName("getQuotaProjectId") + .setReturnType(TypeNode.STRING) + .setExprReferenceExpr(thisClientPropertiesVarExpr) + .build(); + RelationalOperationExpr projectIdIsNull = + RelationalOperationExpr.notEqualToWithExprs(getQuotaProjectId, ValueExpr.createNullExpr()); + + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + MethodInvocationExpr setQuotaProjectId = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName("setQuotaProjectId") + .setArguments(getQuotaProjectId) + .build(); + + IfStatement ifStatement = + createIfStatement( + projectIdIsNull, + Arrays.asList(ExprStatement.withExpr(setQuotaProjectId)), // TODO add logger info + null); + // if (this.clientProperties.getExecutorThreadCount() != null) { + // ExecutorProvider executorProvider = + // LanguageServiceSettings.defaultExecutorProviderBuilder() + // .setExecutorThreadCount(clientProperties.getExecutorThreadCount()).build(); + // clientSettingsBuilder + // .setBackgroundExecutorProvider(executorProvider); + // } + + MethodInvocationExpr getExecutorThreadCount = + MethodInvocationExpr.builder() + .setMethodName("getExecutorThreadCount") + .setReturnType(TypeNode.INT_OBJECT) + .setExprReferenceExpr(thisClientPropertiesVarExpr) + .build(); + RelationalOperationExpr executorThreadCountIsNull = + RelationalOperationExpr.notEqualToWithExprs( + getExecutorThreadCount, ValueExpr.createNullExpr()); + VariableExpr executorProviderVarExpr = + VariableExpr.withVariable( + Variable.builder() + .setType(STATIC_TYPES.get("ExecutorProvider")) + .setName("executorProvider") + .build()); + + MethodInvocationExpr chainedMethodToSetExecutorProvider = + MethodInvocationExpr.builder() + .setStaticReferenceType(types.get("ServiceSettings")) + .setMethodName("defaultExecutorProviderBuilder") + .build(); + chainedMethodToSetExecutorProvider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(chainedMethodToSetExecutorProvider) + .setMethodName("setExecutorThreadCount") + .setArguments(getExecutorThreadCount) + .build(); + chainedMethodToSetExecutorProvider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(chainedMethodToSetExecutorProvider) + .setMethodName("build") + .setReturnType(STATIC_TYPES.get("ExecutorProvider")) + .build(); + AssignmentExpr executorProviderAssignExpr = + AssignmentExpr.builder() + .setVariableExpr(executorProviderVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(chainedMethodToSetExecutorProvider) + .build(); + MethodInvocationExpr setBackgroundExecutorProvider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName("setBackgroundExecutorProvider") + .setArguments(executorProviderVarExpr) + .build(); + + IfStatement ifStatement2 = + createIfStatement( + executorThreadCountIsNull, + Arrays.asList( + ExprStatement.withExpr(executorProviderAssignExpr), + ExprStatement.withExpr(setBackgroundExecutorProvider)), // TODO add logger info + null); + + // TODO: more if statements + // if (clientProperties.getUseRest()) { + // clientSettingsBuilder.setTransportChannelProvider( + // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); + // } + + // TODO: retry settings for each method + // return expressions MethodInvocationExpr serviceSettingsBuilt = MethodInvocationExpr.builder() @@ -647,8 +739,10 @@ private static MethodDefinition createClientBeanMethod( String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; - List bodyExprs = new ArrayList<>(); - bodyExprs.add(settingCreateExpr); + List bodyExprs = new ArrayList<>(); + bodyExprs.add(ExprStatement.withExpr(settingCreateExpr)); + bodyExprs.add(ifStatement); + bodyExprs.add(ifStatement2); return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) @@ -663,34 +757,18 @@ private static MethodDefinition createClientBeanMethod( AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .setReturnExpr(returnExpr) - .setBody( - bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList())) + .setBody(bodyExprs) + // bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList())) .build(); } private static Map createStaticTypes() { List concreteClazzes = Arrays.asList( - // BackgroundResource.class, - // BackgroundResourceAggregation.class, - // BidiStreamingCallable.class, - // ClientContext.class, - // ClientStreamingCallable.class, Generated.class, - // GrpcCallSettings.class, - // GrpcOperationsStub.class, - // GrpcStubCallableFactory.class, - // InterruptedException.class, - // IOException.class, - // MethodDescriptor.class, - // Operation.class, - // OperationCallable.class, - // ProtoUtils.class, - // ServerStreamingCallable.class, - // TimeUnit.class, - // UnaryCallable.class, RetrySettings.class, - TransportChannelProvider.class); + TransportChannelProvider.class, + ExecutorProvider.class); return concreteClazzes.stream() .collect( Collectors.toMap( diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java index 2fe41c535a..307ac3257c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java @@ -206,6 +206,8 @@ private static List createMemberVariables( List statements = retrySettings.stream().map(x -> (Statement) x).collect(Collectors.toList()); + + statements.add(0, useRestVarStatement); statements.add(0, executorThreadCountVarStatement); statements.add(0, quotaProjectIdVarStatement); statements.add(0, credentialsStatement); diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index 81b046b7de..a157301693 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -403,6 +403,7 @@ public void generatePropertiesTest() { "package com.google.showcase.v1beta1.spring;\n" + "\n" + "import com.google.api.gax.core.CredentialsProvider;\n" + + "import com.google.api.gax.core.ExecutorProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" + "import com.google.api.gax.rpc.TransportChannelProvider;\n" // + "import com.google.cloud.spring.core.Credentials;\n" @@ -483,6 +484,16 @@ public void generatePropertiesTest() { + " .setCredentialsProvider(credentialsProvider)\n" + " .setTransportChannelProvider(defaultTransportChannelProvider)\n" + " .setHeaderProvider();\n" + + " if (this.clientProperties.getQuotaProjectId() != null) {\n" + + " clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());\n" + + " }\n" + + " if (this.clientProperties.getExecutorThreadCount() != null) {\n" + + " ExecutorProvider executorProvider =\n" + + " EchoSettings.defaultExecutorProviderBuilder()\n" + + " .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())\n" + + " .build();\n" + + " clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);\n" + + " }\n" + " return EchoClient.create(clientSettingsBuilder.build());\n" + " }\n" + "}\n"; From 7b67cfd1786bba2eec7349f5e30245a5dbde1bf7 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 26 Aug 2022 15:36:20 +0000 Subject: [PATCH 020/103] adding if statements to client bean creation. --- .../SpringAutoConfigClassComposer.java | 38 ++++++++++++++++++- .../SpringAutoConfigClassComposerTest.java | 5 +++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 97ad468c16..2a08c46bbd 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic.composer; import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; @@ -710,12 +711,44 @@ private static MethodDefinition createClientBeanMethod( ExprStatement.withExpr(setBackgroundExecutorProvider)), // TODO add logger info null); - // TODO: more if statements // if (clientProperties.getUseRest()) { // clientSettingsBuilder.setTransportChannelProvider( // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); // } + MethodInvocationExpr getUseRest = + MethodInvocationExpr.builder() + .setMethodName("getUseRest") + .setReturnType(TypeNode.BOOLEAN) + .setExprReferenceExpr(thisClientPropertiesVarExpr) + .build(); + + // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build() + Expr defaultTransportProviderBuider = + MethodInvocationExpr.builder() + .setStaticReferenceType(types.get("ServiceSettings")) + .setMethodName("defaultHttpJsonTransportProviderBuilder") + .build(); + defaultTransportProviderBuider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(defaultTransportProviderBuider) + .setMethodName("build") + .setReturnType(STATIC_TYPES.get("InstantiatingHttpJsonChannelProvider")) + .build(); + + MethodInvocationExpr setTransportProvider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName("setTransportChannelProvider") + .setArguments(defaultTransportProviderBuider) + .build(); + IfStatement ifStatement3 = + createIfStatement( + getUseRest, + Arrays.asList( + ExprStatement.withExpr(setTransportProvider)), + null); + // TODO: retry settings for each method // return expressions @@ -743,6 +776,7 @@ private static MethodDefinition createClientBeanMethod( bodyExprs.add(ExprStatement.withExpr(settingCreateExpr)); bodyExprs.add(ifStatement); bodyExprs.add(ifStatement2); + bodyExprs.add(ifStatement3); return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) @@ -768,6 +802,8 @@ private static Map createStaticTypes() { Generated.class, RetrySettings.class, TransportChannelProvider.class, + // import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; + InstantiatingHttpJsonChannelProvider.class, ExecutorProvider.class); return concreteClazzes.stream() .collect( diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java index a157301693..31931f4cb1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java @@ -404,6 +404,7 @@ public void generatePropertiesTest() { + "\n" + "import com.google.api.gax.core.CredentialsProvider;\n" + "import com.google.api.gax.core.ExecutorProvider;\n" + + "import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" + "import com.google.api.gax.rpc.TransportChannelProvider;\n" // + "import com.google.cloud.spring.core.Credentials;\n" @@ -494,6 +495,10 @@ public void generatePropertiesTest() { + " .build();\n" + " clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);\n" + " }\n" + + " if (this.clientProperties.getUseRest()) {\n" + + " clientSettingsBuilder.setTransportChannelProvider(\n" + + " EchoSettings.defaultHttpJsonTransportProviderBuilder().build());\n" + + " }\n" + " return EchoClient.create(clientSettingsBuilder.build());\n" + " }\n" + "}\n"; From 37e5cfa25299900ae690f14fe93f1d224029d012 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 26 Aug 2022 16:35:38 +0000 Subject: [PATCH 021/103] minor cleanup edits. --- .../SpringAutoConfigClassComposer.java | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java index 2a08c46bbd..1e95164ced 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java @@ -563,6 +563,7 @@ private static MethodDefinition createClientBeanMethod( .setType(STATIC_TYPES.get("TransportChannelProvider")) .build()); + List bodyStatements = new ArrayList<>(); // LanguageServiceSettings.Builder clientSettingsBuilder = // LanguageServiceSettings.newBuilder() // .setCredentialsProvider(credentialsProvider) @@ -611,6 +612,8 @@ private static MethodDefinition createClientBeanMethod( .setValueExpr(settingsBuilderExpr) .build(); + bodyStatements.add(ExprStatement.withExpr(settingCreateExpr)); + // if (this.clientProperties.getQuotaProjectId() != null) { // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() @@ -622,12 +625,12 @@ private static MethodDefinition createClientBeanMethod( .setName("clientProperties") .setType(types.get(service.name() + "Properties")) .build(); - VariableExpr thisClientPropertiesVarExpr = VariableExpr.withVariable(clientPropertiesVar) .toBuilder() .setExprReferenceExpr(thisExpr) .build(); + MethodInvocationExpr getQuotaProjectId = MethodInvocationExpr.builder() .setMethodName("getQuotaProjectId") @@ -645,11 +648,14 @@ private static MethodDefinition createClientBeanMethod( .setArguments(getQuotaProjectId) .build(); - IfStatement ifStatement = + IfStatement setQuotaProjectIdStatement = createIfStatement( projectIdIsNull, Arrays.asList(ExprStatement.withExpr(setQuotaProjectId)), // TODO add logger info null); + + bodyStatements.add(setQuotaProjectIdStatement); + // if (this.clientProperties.getExecutorThreadCount() != null) { // ExecutorProvider executorProvider = // LanguageServiceSettings.defaultExecutorProviderBuilder() @@ -667,6 +673,7 @@ private static MethodDefinition createClientBeanMethod( RelationalOperationExpr executorThreadCountIsNull = RelationalOperationExpr.notEqualToWithExprs( getExecutorThreadCount, ValueExpr.createNullExpr()); + VariableExpr executorProviderVarExpr = VariableExpr.withVariable( Variable.builder() @@ -703,7 +710,7 @@ private static MethodDefinition createClientBeanMethod( .setArguments(executorProviderVarExpr) .build(); - IfStatement ifStatement2 = + IfStatement setBackgroundExecutorProviderStatement = createIfStatement( executorThreadCountIsNull, Arrays.asList( @@ -711,6 +718,8 @@ private static MethodDefinition createClientBeanMethod( ExprStatement.withExpr(setBackgroundExecutorProvider)), // TODO add logger info null); + bodyStatements.add(setBackgroundExecutorProviderStatement); + // if (clientProperties.getUseRest()) { // clientSettingsBuilder.setTransportChannelProvider( // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); @@ -742,15 +751,28 @@ private static MethodDefinition createClientBeanMethod( .setMethodName("setTransportChannelProvider") .setArguments(defaultTransportProviderBuider) .build(); - IfStatement ifStatement3 = + IfStatement setTransportChannelProviderStatement = createIfStatement( - getUseRest, - Arrays.asList( - ExprStatement.withExpr(setTransportProvider)), - null); + getUseRest, Arrays.asList(ExprStatement.withExpr(setTransportProvider)), null); + bodyStatements.add(setTransportChannelProviderStatement); // TODO: retry settings for each method + // RetrySettings annotateTextSettingsRetrySettings = + // clientSettingsBuilder.annotateTextSettings() + // .getRetrySettings() + // .toBuilder() + // .setInitialRetryDelay(this.clientProperties.getAnnotateTextMaxRetryDelay()) + // .setRetryDelayMultiplier(this.clientProperties.getAnnotateTextRpcTimeoutMultiplier()) + // .setMaxRetryDelay(this.clientProperties.getAnnotateTextMaxRetryDelay()) + // .setInitialRpcTimeout(this.clientProperties.getAnnotateTextInitialRpcTimeout()) + // .setRpcTimeoutMultiplier(this.clientProperties.getAnnotateTextRpcTimeoutMultiplier()) + // .setMaxRpcTimeout(this.clientProperties.getAnnotateTextMaxRpcTimeout()) + // .setTotalTimeout(this.clientProperties.getAnnotateTextTotalTimeout()) + // .build(); + // clientSettingsBuilder.annotateTextSettings() + // .setRetrySettings(annotateTextSettingsRetrySettings); + // return expressions MethodInvocationExpr serviceSettingsBuilt = MethodInvocationExpr.builder() @@ -772,11 +794,6 @@ private static MethodDefinition createClientBeanMethod( String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; - List bodyExprs = new ArrayList<>(); - bodyExprs.add(ExprStatement.withExpr(settingCreateExpr)); - bodyExprs.add(ifStatement); - bodyExprs.add(ifStatement2); - bodyExprs.add(ifStatement3); return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) @@ -791,7 +808,7 @@ private static MethodDefinition createClientBeanMethod( AnnotationNode.withType(types.get("ConditionalOnMissingBean")))) .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .setReturnExpr(returnExpr) - .setBody(bodyExprs) + .setBody(bodyStatements) // bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList())) .build(); } From 53400f6161f589505dfbe7dfd88bbcc2becfea57 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 26 Aug 2022 16:58:50 +0000 Subject: [PATCH 022/103] move added spring composers to new package. --- src/main/java/com/google/api/generator/gapic/Generator.java | 2 +- .../composer/SpringAutoConfigClassComposer.java | 2 +- .../generator/{gapic => spring}/composer/SpringComposer.java | 3 ++- .../composer/SpringPropertiesClassComposer.java | 2 +- .../SpringAutoConfigClassComposerTest.java | 4 +++- .../{gapic/composer => spring}/SpringComposerTest.java | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-) rename src/main/java/com/google/api/generator/{gapic => spring}/composer/SpringAutoConfigClassComposer.java (99%) rename src/main/java/com/google/api/generator/{gapic => spring}/composer/SpringComposer.java (94%) rename src/main/java/com/google/api/generator/{gapic => spring}/composer/SpringPropertiesClassComposer.java (99%) rename src/test/java/com/google/api/generator/{gapic/composer => spring}/SpringAutoConfigClassComposerTest.java (99%) rename src/test/java/com/google/api/generator/{gapic/composer => spring}/SpringComposerTest.java (97%) diff --git a/src/main/java/com/google/api/generator/gapic/Generator.java b/src/main/java/com/google/api/generator/gapic/Generator.java index 85625a7ee1..e8646ac0c4 100644 --- a/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/src/main/java/com/google/api/generator/gapic/Generator.java @@ -15,12 +15,12 @@ package com.google.api.generator.gapic; import com.google.api.generator.gapic.composer.Composer; -import com.google.api.generator.gapic.composer.SpringComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.gapic.protowriter.Writer; +import com.google.api.generator.spring.composer.SpringComposer; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.util.List; diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java similarity index 99% rename from src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java rename to src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 1e95164ced..a66de64246 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.spring.composer; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java similarity index 94% rename from src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java rename to src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index 48ed967373..673064ee7c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.spring.composer; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.gapic.composer.comment.CommentComposer; @@ -39,6 +39,7 @@ protected static List generateClientAutoConfig(GapicContext context) s -> { if (context.transport() == Transport.GRPC) { clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s)); + // clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s)); } }); return clazzes; diff --git a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java similarity index 99% rename from src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java rename to src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 307ac3257c..72dbe332a1 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.spring.composer; import static com.google.api.generator.engine.ast.NewObjectExpr.*; diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java similarity index 99% rename from src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java rename to src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 31931f4cb1..43a234bc40 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.spring; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -48,6 +48,8 @@ import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.gapic.protoparser.ServiceConfigParser; +import com.google.api.generator.spring.composer.SpringAutoConfigClassComposer; +import com.google.api.generator.spring.composer.SpringPropertiesClassComposer; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; diff --git a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java similarity index 97% rename from src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java rename to src/test/java/com/google/api/generator/spring/SpringComposerTest.java index 9f00a78353..c666e084c0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.spring; import static org.junit.Assert.assertTrue; @@ -28,6 +28,7 @@ import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.gapic.protoparser.ServiceConfigParser; +import com.google.api.generator.spring.composer.SpringComposer; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; From 906f9bf1f7200c2d30f061c01ea11a22bc2fc1a2 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 30 Aug 2022 13:37:20 +0000 Subject: [PATCH 023/103] add expected generated property class to test. --- .../SpringAutoConfigClassComposerTest.java | 488 ++++++++++++++++++ 1 file changed, 488 insertions(+) diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 43a234bc40..cc442418b8 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -399,6 +399,7 @@ public void generatePropertiesTest() { clazz.classDefinition().accept(visitor); // TODO: print out to check results for now. Need to convert to assert. System.out.println(visitor.write()); + assertEquals(EXPECTED_PROPERTY_CLASS_STRING, visitor.write()); } protected static final String EXPECTED_CLASS_STRING = @@ -504,4 +505,491 @@ public void generatePropertiesTest() { + " return EchoClient.create(clientSettingsBuilder.build());\n" + " }\n" + "}\n"; + + protected static final String EXPECTED_PROPERTY_CLASS_STRING = + "package com.google.showcase.v1beta1.spring;\n" + + "\n" + + "import com.google.cloud.spring.core.Credentials;\n" + + "import com.google.cloud.spring.core.CredentialsSupplier;\n" + + "import org.springframework.boot.context.properties.ConfigurationProperties;\n" + + "import org.threeten.bp.Duration;\n" + + "\n" + + "@ConfigurationProperties(\"google.cloud.spring.autoconfig.echo\")\n" + + "public class EchoSpringProperties implements CredentialsSupplier {\n" + + " private final Credentials credentials =\n" + + " new Credentials(\"https://www.googleapis.com/auth/cloud-platform\");\n" + + " private String quotaProjectId;\n" + + " private Integer executorThreadCount;\n" + + " private boolean useRest;\n" + // retry settings per method, with default + // (alternative not setting default here, but in autoconfig bean creation) + + " private Duration echoInitialRetryDelay = Duration.ofMillis(100L);\n" + + " private double echoRetryDelayMultiplier = 2.0;\n" + + " private Duration echoMaxRetryDelay = Duration.ofMillis(3000L);\n" + + " private Duration echoInitialRpcTimeout = Duration.ofMillis(10000L);\n" + + " private double echoRpcTimeoutMultiplier = 1.0;\n" + + " private Duration echoMaxRpcTimeout = Duration.ofMillis(10000L);\n" + + " private Duration echoTotalTimeout = Duration.ofMillis(10000L);\n" + + " private Duration expandInitialRetryDelay = Duration.ofMillis(100L);\n" + + " private double expandRetryDelayMultiplier = 2.0;\n" + + " private Duration expandMaxRetryDelay = Duration.ofMillis(3000L);\n" + + " private Duration expandInitialRpcTimeout = Duration.ofMillis(10000L);\n" + + " private double expandRpcTimeoutMultiplier = 1.0;\n" + + " private Duration expandMaxRpcTimeout = Duration.ofMillis(10000L);\n" + + " private Duration expandTotalTimeout = Duration.ofMillis(10000L);\n" + + " private Duration collectInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double collectRpcTimeoutMultiplier = 1.0;\n" + + " private Duration collectMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration collectTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration chatInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double chatRpcTimeoutMultiplier = 1.0;\n" + + " private Duration chatMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration chatTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration chatAgainInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double chatAgainRpcTimeoutMultiplier = 1.0;\n" + + " private Duration chatAgainMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration chatAgainTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration pagedExpandInitialRetryDelay = Duration.ofMillis(100L);\n" + + " private double pagedExpandRetryDelayMultiplier = 2.0;\n" + + " private Duration pagedExpandMaxRetryDelay = Duration.ofMillis(3000L);\n" + + " private Duration pagedExpandInitialRpcTimeout = Duration.ofMillis(10000L);\n" + + " private double pagedExpandRpcTimeoutMultiplier = 1.0;\n" + + " private Duration pagedExpandMaxRpcTimeout = Duration.ofMillis(10000L);\n" + + " private Duration pagedExpandTotalTimeout = Duration.ofMillis(10000L);\n" + + " private Duration simplePagedExpandInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double simplePagedExpandRpcTimeoutMultiplier = 1.0;\n" + + " private Duration simplePagedExpandMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration simplePagedExpandTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration waitInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double waitRpcTimeoutMultiplier = 1.0;\n" + + " private Duration waitMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration waitTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration blockInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double blockRpcTimeoutMultiplier = 1.0;\n" + + " private Duration blockMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration blockTotalTimeout = Duration.ofMillis(5000L);\n" + + " private Duration collideNameInitialRpcTimeout = Duration.ofMillis(5000L);\n" + + " private double collideNameRpcTimeoutMultiplier = 1.0;\n" + + " private Duration collideNameMaxRpcTimeout = Duration.ofMillis(5000L);\n" + + " private Duration collideNameTotalTimeout = Duration.ofMillis(5000L);\n" + + "\n" + + " @Override\n" + + " public Credentials getCredentials() {\n" + + " return this.credentials;\n" + + " }\n" + + "\n" + + " public String getQuotaProjectId() {\n" + + " return this.quotaProjectId;\n" + + " }\n" + + "\n" + + " public void setQuotaProjectId(String quotaProjectId) {\n" + + " this.quotaProjectId = quotaProjectId;\n" + + " }\n" + + "\n" + + " public boolean getUseRest() {\n" + + " return this.useRest;\n" + + " }\n" + + "\n" + + " public Integer getExecutorThreadCount() {\n" + + " return this.executorThreadCount;\n" + + " }\n" + + "\n" + + " public void setExecutorThreadCount(Integer executorThreadCount) {\n" + + " this.executorThreadCount = executorThreadCount;\n" + + " }\n" + + "\n" + // getters and setters for retry settings. + + " public Duration getEchoInitialRetryDelay() {\n" + + " return this.echoInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) {\n" + + " this.echoInitialRetryDelay = echoInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public double getEchoRetryDelayMultiplier() {\n" + + " return this.echoRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public void setEchoRetryDelayMultiplier(double echoRetryDelayMultiplier) {\n" + + " this.echoRetryDelayMultiplier = echoRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getEchoMaxRetryDelay() {\n" + + " return this.echoMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) {\n" + + " this.echoMaxRetryDelay = echoMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public Duration getEchoInitialRpcTimeout() {\n" + + " return this.echoInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) {\n" + + " this.echoInitialRpcTimeout = echoInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getEchoRpcTimeoutMultiplier() {\n" + + " return this.echoRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setEchoRpcTimeoutMultiplier(double echoRpcTimeoutMultiplier) {\n" + + " this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getEchoMaxRpcTimeout() {\n" + + " return this.echoMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) {\n" + + " this.echoMaxRpcTimeout = echoMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getEchoTotalTimeout() {\n" + + " return this.echoTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setEchoTotalTimeout(Duration echoTotalTimeout) {\n" + + " this.echoTotalTimeout = echoTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getExpandInitialRetryDelay() {\n" + + " return this.expandInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) {\n" + + " this.expandInitialRetryDelay = expandInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public double getExpandRetryDelayMultiplier() {\n" + + " return this.expandRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public void setExpandRetryDelayMultiplier(double expandRetryDelayMultiplier) {\n" + + " this.expandRetryDelayMultiplier = expandRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getExpandMaxRetryDelay() {\n" + + " return this.expandMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) {\n" + + " this.expandMaxRetryDelay = expandMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public Duration getExpandInitialRpcTimeout() {\n" + + " return this.expandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) {\n" + + " this.expandInitialRpcTimeout = expandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getExpandRpcTimeoutMultiplier() {\n" + + " return this.expandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setExpandRpcTimeoutMultiplier(double expandRpcTimeoutMultiplier) {\n" + + " this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getExpandMaxRpcTimeout() {\n" + + " return this.expandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) {\n" + + " this.expandMaxRpcTimeout = expandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getExpandTotalTimeout() {\n" + + " return this.expandTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setExpandTotalTimeout(Duration expandTotalTimeout) {\n" + + " this.expandTotalTimeout = expandTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getCollectInitialRpcTimeout() {\n" + + " return this.collectInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) {\n" + + " this.collectInitialRpcTimeout = collectInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getCollectRpcTimeoutMultiplier() {\n" + + " return this.collectRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setCollectRpcTimeoutMultiplier(double collectRpcTimeoutMultiplier) {\n" + + " this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getCollectMaxRpcTimeout() {\n" + + " return this.collectMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) {\n" + + " this.collectMaxRpcTimeout = collectMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getCollectTotalTimeout() {\n" + + " return this.collectTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setCollectTotalTimeout(Duration collectTotalTimeout) {\n" + + " this.collectTotalTimeout = collectTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getChatInitialRpcTimeout() {\n" + + " return this.chatInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) {\n" + + " this.chatInitialRpcTimeout = chatInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getChatRpcTimeoutMultiplier() {\n" + + " return this.chatRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setChatRpcTimeoutMultiplier(double chatRpcTimeoutMultiplier) {\n" + + " this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getChatMaxRpcTimeout() {\n" + + " return this.chatMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) {\n" + + " this.chatMaxRpcTimeout = chatMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getChatTotalTimeout() {\n" + + " return this.chatTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setChatTotalTimeout(Duration chatTotalTimeout) {\n" + + " this.chatTotalTimeout = chatTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getChatAgainInitialRpcTimeout() {\n" + + " return this.chatAgainInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) {\n" + + " this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getChatAgainRpcTimeoutMultiplier() {\n" + + " return this.chatAgainRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setChatAgainRpcTimeoutMultiplier(double chatAgainRpcTimeoutMultiplier) {\n" + + " this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getChatAgainMaxRpcTimeout() {\n" + + " return this.chatAgainMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) {\n" + + " this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getChatAgainTotalTimeout() {\n" + + " return this.chatAgainTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) {\n" + + " this.chatAgainTotalTimeout = chatAgainTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getPagedExpandInitialRetryDelay() {\n" + + " return this.pagedExpandInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) {\n" + + " this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay;\n" + + " }\n" + + "\n" + + " public double getPagedExpandRetryDelayMultiplier() {\n" + + " return this.pagedExpandRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public void setPagedExpandRetryDelayMultiplier(double pagedExpandRetryDelayMultiplier) {\n" + + " this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getPagedExpandMaxRetryDelay() {\n" + + " return this.pagedExpandMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) {\n" + + " this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay;\n" + + " }\n" + + "\n" + + " public Duration getPagedExpandInitialRpcTimeout() {\n" + + " return this.pagedExpandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) {\n" + + " this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getPagedExpandRpcTimeoutMultiplier() {\n" + + " return this.pagedExpandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setPagedExpandRpcTimeoutMultiplier(double pagedExpandRpcTimeoutMultiplier) {\n" + + " this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getPagedExpandMaxRpcTimeout() {\n" + + " return this.pagedExpandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) {\n" + + " this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getPagedExpandTotalTimeout() {\n" + + " return this.pagedExpandTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) {\n" + + " this.pagedExpandTotalTimeout = pagedExpandTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getSimplePagedExpandInitialRpcTimeout() {\n" + + " return this.simplePagedExpandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) {\n" + + " this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getSimplePagedExpandRpcTimeoutMultiplier() {\n" + + " return this.simplePagedExpandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setSimplePagedExpandRpcTimeoutMultiplier(\n" + + " double simplePagedExpandRpcTimeoutMultiplier) {\n" + + " this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getSimplePagedExpandMaxRpcTimeout() {\n" + + " return this.simplePagedExpandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) {\n" + + " this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getSimplePagedExpandTotalTimeout() {\n" + + " return this.simplePagedExpandTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) {\n" + + " this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getWaitInitialRpcTimeout() {\n" + + " return this.waitInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) {\n" + + " this.waitInitialRpcTimeout = waitInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getWaitRpcTimeoutMultiplier() {\n" + + " return this.waitRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setWaitRpcTimeoutMultiplier(double waitRpcTimeoutMultiplier) {\n" + + " this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getWaitMaxRpcTimeout() {\n" + + " return this.waitMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) {\n" + + " this.waitMaxRpcTimeout = waitMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getWaitTotalTimeout() {\n" + + " return this.waitTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setWaitTotalTimeout(Duration waitTotalTimeout) {\n" + + " this.waitTotalTimeout = waitTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getBlockInitialRpcTimeout() {\n" + + " return this.blockInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) {\n" + + " this.blockInitialRpcTimeout = blockInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getBlockRpcTimeoutMultiplier() {\n" + + " return this.blockRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setBlockRpcTimeoutMultiplier(double blockRpcTimeoutMultiplier) {\n" + + " this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getBlockMaxRpcTimeout() {\n" + + " return this.blockMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) {\n" + + " this.blockMaxRpcTimeout = blockMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getBlockTotalTimeout() {\n" + + " return this.blockTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setBlockTotalTimeout(Duration blockTotalTimeout) {\n" + + " this.blockTotalTimeout = blockTotalTimeout;\n" + + " }\n" + + "\n" + + " public Duration getCollideNameInitialRpcTimeout() {\n" + + " return this.collideNameInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) {\n" + + " this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout;\n" + + " }\n" + + "\n" + + " public double getCollideNameRpcTimeoutMultiplier() {\n" + + " return this.collideNameRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public void setCollideNameRpcTimeoutMultiplier(double collideNameRpcTimeoutMultiplier) {\n" + + " this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier;\n" + + " }\n" + + "\n" + + " public Duration getCollideNameMaxRpcTimeout() {\n" + + " return this.collideNameMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) {\n" + + " this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout;\n" + + " }\n" + + "\n" + + " public Duration getCollideNameTotalTimeout() {\n" + + " return this.collideNameTotalTimeout;\n" + + " }\n" + + "\n" + + " public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) {\n" + + " this.collideNameTotalTimeout = collideNameTotalTimeout;\n" + + " }\n" + + "}\n"; } From a571639742bc98aad42841d6920a957b1dabe1fa Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 30 Aug 2022 14:06:47 +0000 Subject: [PATCH 024/103] cleanup unused code in test.: --- .../SpringAutoConfigClassComposerTest.java | 296 ------------------ 1 file changed, 296 deletions(-) diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index cc442418b8..f17403c95f 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -17,26 +17,6 @@ import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.api.generator.engine.ast.AnnotationNode; -import com.google.api.generator.engine.ast.AssignmentExpr; -import com.google.api.generator.engine.ast.BlockComment; -import com.google.api.generator.engine.ast.CastExpr; -import com.google.api.generator.engine.ast.ClassDefinition; -import com.google.api.generator.engine.ast.CommentStatement; -import com.google.api.generator.engine.ast.Expr; -import com.google.api.generator.engine.ast.ExprStatement; -import com.google.api.generator.engine.ast.IfStatement; -import com.google.api.generator.engine.ast.LambdaExpr; -import com.google.api.generator.engine.ast.MethodDefinition; -import com.google.api.generator.engine.ast.MethodInvocationExpr; -import com.google.api.generator.engine.ast.RelationalOperationExpr; -import com.google.api.generator.engine.ast.ScopeNode; -import com.google.api.generator.engine.ast.ThisObjectValue; -import com.google.api.generator.engine.ast.TypeNode; -import com.google.api.generator.engine.ast.ValueExpr; -import com.google.api.generator.engine.ast.VaporReference; -import com.google.api.generator.engine.ast.Variable; -import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; import com.google.api.generator.gapic.composer.common.TestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; @@ -53,17 +33,13 @@ import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; @@ -78,255 +54,6 @@ public void setUp() { assertEquals(echoService.getName(), "Echo"); } - @Test - public void writeMethodDefinition_constructor() { - // To be deleted, please ignore: practice AST grammar here. - JavaWriterVisitor writerVisitor = new JavaWriterVisitor(); - - // header - List fileHeader = - Arrays.asList(CommentStatement.withComment(BlockComment.withComment("Apache License"))); - // annotation types - TypeNode beanAnnotationType = - TypeNode.withReference( - VaporReference.builder() - .setName("Bean") - .setPakkage("org.springframework.context.annotation") - .build()); - TypeNode conditionalOnMissingBeanType = - TypeNode.withReference( - VaporReference.builder() - .setName("ConditionalOnMissingBean") - .setPakkage("org.springframework.boot.autoconfigure.condition") - .build()); - TypeNode conditionalOnPropertyType = - TypeNode.withReference( - VaporReference.builder() - .setName("ConditionalOnProperty") - .setPakkage("org.springframework.boot.autoconfigure.condition") - .build()); - // AnnotationNode description only accepts String for now. need to extend to params - AnnotationNode conditionalOnPropertyNode = - AnnotationNode.builder() - .setType(conditionalOnPropertyType) - .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") - .build(); - // client type - TypeNode clientType = - TypeNode.withReference( - VaporReference.builder() - .setName("LanguageServiceClient") - .setPakkage("com.google.cloud.language.v1") - .build()); - // build expressions - MethodInvocationExpr lhsExpr = - MethodInvocationExpr.builder() - .setMethodName("create") - .setStaticReferenceType(clientType) - .setReturnType(clientType) - .build(); - - VariableExpr variableExpr = - VariableExpr.builder() - .setVariable(Variable.builder().setName("client").setType(clientType).build()) - .setIsDecl(true) - .build(); - - // VariableExpr returnArg = VariableExpr.builder() - // .setVariable(createVariable("client", clientType)) - // .build(); - - MethodInvocationExpr expr = - MethodInvocationExpr.builder() - .setMethodName("languageServiceClientCreate") - .setReturnType(clientType) - .build(); - - // AssignmentExpr assignmentExpr = AssignmentExpr.builder().setVariableExpr(variableExpr) - // .setValueExpr(expr).build(); - - MethodDefinition beanMethod = - MethodDefinition.builder() - .setName("languageServiceClient") - .setScope(ScopeNode.PUBLIC) - .setReturnType(clientType) - .setAnnotations( - Arrays.asList( - AnnotationNode.withType(beanAnnotationType), - AnnotationNode.withType(conditionalOnMissingBeanType))) - .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) - .setReturnExpr(lhsExpr) - // .setBody( - // Arrays.asList(ExprStatement.withExpr(assignmentExpr))) - .build(); - - // members - TypeNode credentialsProvider = - TypeNode.withReference( - VaporReference.builder() - .setName("CredentialsProvider") - .setPakkage("com.google.api.gax.core") - .build()); - TypeNode thisClassType = - TypeNode.withReference( - VaporReference.builder() - .setName("LibraryServiceStub") - .setPakkage("com.google.example.library.v1") - .build()); - TypeNode clientProperties = - TypeNode.withReference( - VaporReference.builder() - .setName("LanguageProperties") - .setPakkage("com.google.example.library.v1") - .build()); - // import com.google.cloud.spring.core.GcpProjectIdProvider; - - TypeNode gcpProjectIdProvider = - TypeNode.withReference( - VaporReference.builder() - .setName("GcpProjectIdProvider") - .setPakkage("com.google.cloud.spring.core") - .build()); - // TypeNode thisClassType = - // TypeNode thisClassType = typeStore.get(ClassNames.getServiceSettingsClassName(service)); - - Variable variable = - Variable.builder().setName("credentialsProvider").setType(credentialsProvider).build(); - VariableExpr varExpr = - VariableExpr.builder() - .setVariable(variable) - .setScope(ScopeNode.PRIVATE) - .setIsFinal(true) - .setIsDecl(true) - .build(); - ExprStatement statement1 = ExprStatement.withExpr(varExpr); - - // private final LanguageProperties clientProperties; - Variable propertiesVar = - Variable.builder().setName("clientProperties").setType(clientProperties).build(); - VariableExpr propertiesVarExpr = - VariableExpr.builder() - .setVariable(propertiesVar) - .setScope(ScopeNode.PRIVATE) - .setIsFinal(true) - .setIsDecl(true) - .build(); - ExprStatement statement2 = ExprStatement.withExpr(propertiesVarExpr); - - // private final GcpProjectIdProvider projectIdProvider; - Variable projectIdProviderVar = - Variable.builder().setName("projectIdProvider").setType(gcpProjectIdProvider).build(); - VariableExpr projectIdProviderVarExpr = - VariableExpr.builder() - .setVariable(projectIdProviderVar) - .setScope(ScopeNode.PRIVATE) - .setIsFinal(true) - .setIsDecl(true) - .build(); - ExprStatement statement3 = ExprStatement.withExpr(projectIdProviderVarExpr); - - /// constructor - VariableExpr credentialsProviderBuilderVarExpr = - VariableExpr.withVariable( - Variable.builder() - .setName("coreCredentialsProvider") - .setType(credentialsProvider) - .build()); - - VariableExpr coreProjectIdProviderVarExpr = - VariableExpr.withVariable( - Variable.builder() - .setName("coreProjectIdProvider") - .setType(gcpProjectIdProvider) - .build()); - - List ctorAssignmentExprs = new ArrayList<>(); - Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); - ctorAssignmentExprs.add( - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(projectIdProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr(coreProjectIdProviderVarExpr) - .build()); - - /** - * if (clientProperties.getProjectId() != null) { this.projectIdProvider = - * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } - */ - - // expr: clientProperties.getProjectId() != null - MethodInvocationExpr getProjectIdExpr = - MethodInvocationExpr.builder() - .setMethodName("getProjectId") - .setExprReferenceExpr(VariableExpr.withVariable(propertiesVar).toBuilder().build()) - // .setStaticReferenceType(clientType) - .setReturnType(credentialsProvider) // fake it - .build(); - RelationalOperationExpr notEqualSentence = - RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, ValueExpr.createNullExpr()); - - // this.projectIdProvider = () -> clientProperties.getProjectId(); - LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); - - // this.projectIdProvider = () -> clientProperties.getProjectId(); - AssignmentExpr projectIdProviderAssignExpr = - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable(projectIdProviderVar) - .toBuilder() - .setExprReferenceExpr(thisExpr) - .build()) - .setValueExpr( - CastExpr.builder().setExpr(lambdaExpr).setType(gcpProjectIdProvider).build()) - .build(); - - IfStatement ifStatement = - IfStatement.builder() - .setConditionExpr(notEqualSentence) - .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) - .setElseBody( - ctorAssignmentExprs.stream() - .map(e -> ExprStatement.withExpr(e)) - .collect(Collectors.toList())) - .build(); - - MethodDefinition constructor = - MethodDefinition.constructorBuilder() - .setScope(ScopeNode.PROTECTED) - .setReturnType(thisClassType) - .setArguments( - Arrays.asList( - credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), - coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build())) - // .setThrowsExceptions(Arrays.asList(FIXED_TYPESTORE.get("IOException"))) - .setBody(Arrays.asList(ifStatement)) - .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) - // ctorAssignmentExprs.stream() - // .map(e -> ExprStatement.withExpr(e)) - // .collect(Collectors.toList())) - .build(); - /// end constructor - - ClassDefinition classDef = - ClassDefinition.builder() - .setFileHeader(fileHeader) - .setPackageString("com.google.example.library.v1") - .setName("LibraryServiceStub") - .setScope(ScopeNode.PUBLIC) - .setStatements(Arrays.asList(statement1, statement2, statement3)) - .setMethods(Arrays.asList(constructor, beanMethod)) - .setAnnotations(Arrays.asList(conditionalOnPropertyNode)) - .build(); - - classDef.accept(writerVisitor); - System.out.println("HERE STARTS OUTPUT: "); - System.out.println(writerVisitor.write()); - // Assert.assertEquals("public LibrarySettings() {\n}\n\n", writerVisitor.write()); - } - @Test public void generateAutoConfigClasses() { Map messageTypes = Parser.parseMessages(echoFileDescriptor); @@ -359,7 +86,6 @@ public void generateAutoConfigClasses() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); - System.out.println(visitor.write()); assertEquals(EXPECTED_CLASS_STRING, visitor.write()); } @@ -397,8 +123,6 @@ public void generatePropertiesTest() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); - // TODO: print out to check results for now. Need to convert to assert. - System.out.println(visitor.write()); assertEquals(EXPECTED_PROPERTY_CLASS_STRING, visitor.write()); } @@ -410,9 +134,7 @@ public void generatePropertiesTest() { + "import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;\n" + "import com.google.api.gax.retrying.RetrySettings;\n" + "import com.google.api.gax.rpc.TransportChannelProvider;\n" - // + "import com.google.cloud.spring.core.Credentials;\n" + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" - // + "import com.google.cloud.spring.core.GcpProjectIdProvider;\n" + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import com.google.showcase.v1beta1.EchoSettings;\n" @@ -431,9 +153,7 @@ public void generatePropertiesTest() { + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + "public class EchoSpringAutoConfiguration {\n" - // + " private final CredentialsProvider credentialsProvider;\n" + " private final EchoSpringProperties clientProperties;\n" - // + " private final GcpProjectIdProvider projectIdProvider;\n" + " private static final ImmutableMap RETRY_PARAM_DEFINITIONS;\n" + "\n" + " static {\n" @@ -445,24 +165,8 @@ public void generatePropertiesTest() { + " }\n" + "\n" + " protected EchoSpringAutoConfiguration(" - // + " CredentialsProvider coreCredentialsProvider,\n" - // + " GcpProjectIdProvider coreProjectIdProvider,\n" + "EchoSpringProperties clientProperties) {\n" - // + " throws IOException {\n" + " this.clientProperties = clientProperties;\n" - // + " if (clientProperties.getCredentials().hasKey()) {\n" - // + " this.credentialsProvider =\n" - // + " ((CredentialsProvider) new - // DefaultCredentialsProvider(clientProperties));\n" - // + " } else {\n" - // + " this.credentialsProvider = ((CredentialsProvider) coreProjectIdProvider);\n" - // + " }\n" - // + " if (clientProperties.getProjectId() != null) {\n" - // + " this.projectIdProvider = ((GcpProjectIdProvider) () -> - // clientProperties.getProjectId());\n" - // + " } else {\n" - // + " this.projectIdProvider = coreProjectIdProvider;\n" - // + " }\n" + " }\n" + "\n" + " @Bean\n" From 25716efd5fe8c95241c3ec46305dfb88d474452d Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 30 Aug 2022 14:23:38 +0000 Subject: [PATCH 025/103] move additional code out of gapic RetrySettingsComposer. --- .../common/RetrySettingsComposer.java | 73 --------- .../SpringPropertiesClassComposer.java | 5 +- .../api/generator/spring/composer/Utils.java | 148 ++++++++++++++++++ 3 files changed, 150 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/google/api/generator/spring/composer/Utils.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java index 105d4c0ac7..4298dd442c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java @@ -24,7 +24,6 @@ import com.google.api.gax.rpc.StatusCode; import com.google.api.gax.rpc.UnaryCallSettings; import com.google.api.generator.engine.ast.AssignmentExpr; -import com.google.api.generator.engine.ast.AstNode; import com.google.api.generator.engine.ast.BlockStatement; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.EnumRefExpr; @@ -45,7 +44,6 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; -import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -59,7 +57,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -467,76 +464,6 @@ public static Expr createBatchingBuilderSettingsExpr( .build(); } - public static List processRetrySettings( - Service service, - GapicServiceConfig gapicServiceConfig, - TypeNode thisClassType, - BiFunction> processFunc) { - List resultList = new ArrayList<>(); - for (Method method : service.methods()) { - String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, method.name()); - String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); - // follow logic in: - // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs - // Build the settings object for each config. - - String settingsName = retryParamName; - GapicRetrySettings settings = - gapicServiceConfig.getAllGapicRetrySettings(service).get(retryParamName); - RetryPolicy retryPolicy = settings.retryPolicy(); - if (settings.kind().equals(GapicRetrySettings.Kind.FULL)) { - Preconditions.checkState( - retryPolicy.hasInitialBackoff(), - String.format("initialBackoff not found for setting %s", settingsName)); - - resultList.addAll( - processFunc.apply( - methodName + "InitialRetryDelay", - createDurationOfMillisExpr(toValExpr(retryPolicy.getInitialBackoff())))); - - resultList.addAll( - processFunc.apply( - methodName + "RetryDelayMultiplier", - toValExpr(retryPolicy.getBackoffMultiplier()))); - - Preconditions.checkState( - retryPolicy.hasMaxBackoff(), - String.format("maxBackoff not found for setting %s", settingsName)); - - resultList.addAll( - processFunc.apply( - methodName + "MaxRetryDelay", - createDurationOfMillisExpr(toValExpr(retryPolicy.getMaxBackoff())))); - } - - if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { - - resultList.addAll( - processFunc.apply( - methodName + "InitialRpcTimeout", - createDurationOfMillisExpr(toValExpr(settings.timeout())))); - } - - // This will always be done, no matter the type of the retry settings object. - resultList.addAll( - processFunc.apply( - methodName + "RpcTimeoutMultiplier", - ValueExpr.withValue( - PrimitiveValue.builder().setType(TypeNode.DOUBLE).setValue("1.0").build()))); - - if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { - for (String setterMethodName : Arrays.asList("MaxRpcTimeout", "TotalTimeout")) { - - resultList.addAll( - processFunc.apply( - methodName + setterMethodName, - createDurationOfMillisExpr(toValExpr(settings.timeout())))); - } - } - } - return resultList; - } - private static Expr createRetryCodeDefinitionExpr( String codeName, List retryCodes, VariableExpr definitionsVarExpr) { // Construct something like `definitions.put("code_name", diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 72dbe332a1..141311cc03 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -36,7 +36,6 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.common.ClassComposer; -import com.google.api.generator.gapic.composer.common.RetrySettingsComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; @@ -191,7 +190,7 @@ private static List createMemberVariables( // declare each retry settings with its default value. TypeNode thisClassType = types.get(service.name() + "Properties"); List retrySettings = - RetrySettingsComposer.processRetrySettings( + Utils.processRetrySettings( service, serviceConfig, thisClassType, @@ -236,7 +235,7 @@ private static List createGetterSetters( createSetterMethod(thisClassType, "executorThreadCount", TypeNode.INT_OBJECT)); List retrySettings = - RetrySettingsComposer.processRetrySettings( + Utils.processRetrySettings( service, gapicServiceConfig, thisClassType, diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/composer/Utils.java new file mode 100644 index 0000000000..3ff3436779 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/composer/Utils.java @@ -0,0 +1,148 @@ +// 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.spring.composer; + +import com.google.api.generator.engine.ast.AstNode; +import com.google.api.generator.engine.ast.Expr; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.PrimitiveValue; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.ValueExpr; +import com.google.api.generator.gapic.composer.store.TypeStore; +import com.google.api.generator.gapic.model.GapicRetrySettings; +import com.google.api.generator.gapic.model.GapicServiceConfig; +import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.Service; +import com.google.common.base.CaseFormat; +import com.google.common.base.Preconditions; +import com.google.protobuf.Duration; +import com.google.protobuf.util.Durations; +import io.grpc.serviceconfig.MethodConfig.RetryPolicy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.BiFunction; + +public class Utils { + private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); + + public static List processRetrySettings( + Service service, + GapicServiceConfig gapicServiceConfig, + TypeNode thisClassType, + BiFunction> processFunc) { + List resultList = new ArrayList<>(); + for (Method method : service.methods()) { + String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, method.name()); + String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); + // follow logic in: + // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs + // Build the settings object for each config. + + String settingsName = retryParamName; + GapicRetrySettings settings = + gapicServiceConfig.getAllGapicRetrySettings(service).get(retryParamName); + RetryPolicy retryPolicy = settings.retryPolicy(); + if (settings.kind().equals(GapicRetrySettings.Kind.FULL)) { + Preconditions.checkState( + retryPolicy.hasInitialBackoff(), + String.format("initialBackoff not found for setting %s", settingsName)); + + resultList.addAll( + processFunc.apply( + methodName + "InitialRetryDelay", + createDurationOfMillisExpr(toValExpr(retryPolicy.getInitialBackoff())))); + + resultList.addAll( + processFunc.apply( + methodName + "RetryDelayMultiplier", + toValExpr(retryPolicy.getBackoffMultiplier()))); + + Preconditions.checkState( + retryPolicy.hasMaxBackoff(), + String.format("maxBackoff not found for setting %s", settingsName)); + + resultList.addAll( + processFunc.apply( + methodName + "MaxRetryDelay", + createDurationOfMillisExpr(toValExpr(retryPolicy.getMaxBackoff())))); + } + + if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { + + resultList.addAll( + processFunc.apply( + methodName + "InitialRpcTimeout", + createDurationOfMillisExpr(toValExpr(settings.timeout())))); + } + + // This will always be done, no matter the type of the retry settings object. + resultList.addAll( + processFunc.apply( + methodName + "RpcTimeoutMultiplier", + ValueExpr.withValue( + PrimitiveValue.builder().setType(TypeNode.DOUBLE).setValue("1.0").build()))); + + if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { + for (String setterMethodName : Arrays.asList("MaxRpcTimeout", "TotalTimeout")) { + + resultList.addAll( + processFunc.apply( + methodName + setterMethodName, + createDurationOfMillisExpr(toValExpr(settings.timeout())))); + } + } + } + return resultList; + } + + private static ValueExpr toValExpr(long longValue) { + return ValueExpr.withValue( + PrimitiveValue.builder() + .setType(TypeNode.LONG) + .setValue(String.format("%dL", longValue)) + .build()); + } + + private static ValueExpr toValExpr(float floatValue) { + return toValExpr((double) floatValue); + } + + private static ValueExpr toValExpr(double val) { + return ValueExpr.withValue( + PrimitiveValue.builder() + .setType(TypeNode.DOUBLE) + .setValue(String.format("%.1f", val)) + .build()); + } + + private static ValueExpr toValExpr(Duration duration) { + return toValExpr(Durations.toMillis(duration)); + } + + private static TypeStore createStaticTypes() { + List> concreteClazzes = Arrays.asList(org.threeten.bp.Duration.class); + return new TypeStore(concreteClazzes); + } + + private static MethodInvocationExpr createDurationOfMillisExpr(ValueExpr valExpr) { + return MethodInvocationExpr.builder() + .setStaticReferenceType(FIXED_TYPESTORE.get("Duration")) + .setMethodName("ofMillis") + .setArguments(valExpr) + .setReturnType(FIXED_TYPESTORE.get("Duration")) + .build(); + } +} From f4aa90009fb4612e7765175655b763ada494f389 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 30 Aug 2022 19:50:35 +0000 Subject: [PATCH 026/103] separate out spring generator. --- .../java/com/google/api/generator/Main.java | 3 +- .../google/api/generator/gapic/Generator.java | 10 ------ .../api/generator/spring/SpringGenerator.java | 36 +++++++++++++++++++ 3 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/google/api/generator/spring/SpringGenerator.java diff --git a/src/main/java/com/google/api/generator/Main.java b/src/main/java/com/google/api/generator/Main.java index 8357efb6d3..992c40a085 100644 --- a/src/main/java/com/google/api/generator/Main.java +++ b/src/main/java/com/google/api/generator/Main.java @@ -15,6 +15,7 @@ package com.google.api.generator; import com.google.api.generator.gapic.Generator; +import com.google.api.generator.spring.SpringGenerator; import com.google.protobuf.ExtensionRegistry; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; @@ -26,7 +27,7 @@ public static void main(String[] args) throws IOException { ProtoRegistry.registerAllExtensions(registry); CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry); CodeGeneratorResponse response = Generator.generateGapic(request); - CodeGeneratorResponse springResponse = Generator.generateSpring(request); + CodeGeneratorResponse springResponse = SpringGenerator.generateSpring(request); response.writeTo(System.out); springResponse.writeTo(System.out); } diff --git a/src/main/java/com/google/api/generator/gapic/Generator.java b/src/main/java/com/google/api/generator/gapic/Generator.java index e8646ac0c4..1b957c41cd 100644 --- a/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/src/main/java/com/google/api/generator/gapic/Generator.java @@ -20,7 +20,6 @@ import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.gapic.protowriter.Writer; -import com.google.api.generator.spring.composer.SpringComposer; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.util.List; @@ -33,13 +32,4 @@ public static CodeGeneratorResponse generateGapic(CodeGeneratorRequest request) String outputFilename = "temp-codegen.srcjar"; return Writer.write(context, clazzes, packageInfo, outputFilename, false); } - - public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) { - // not tested. next step: create a wrapper class to call from new bazel build rule. - GapicContext context = Parser.parse(request); - List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); - GapicPackageInfo packageInfo = Composer.composePackageInfo(context); - String outputFilename = "temp-codegen-spring.srcjar"; - return Writer.write(context, clazzes, packageInfo, outputFilename, true); - } } diff --git a/src/main/java/com/google/api/generator/spring/SpringGenerator.java b/src/main/java/com/google/api/generator/spring/SpringGenerator.java new file mode 100644 index 0000000000..ad2b2e2d71 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/SpringGenerator.java @@ -0,0 +1,36 @@ +// 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.spring; + +import com.google.api.generator.gapic.composer.Composer; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicPackageInfo; +import com.google.api.generator.gapic.protoparser.Parser; +import com.google.api.generator.gapic.protowriter.Writer; +import com.google.api.generator.spring.composer.SpringComposer; +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; +import java.util.List; + +public class SpringGenerator { + public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) { + GapicContext context = Parser.parse(request); + List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); + GapicPackageInfo packageInfo = Composer.composePackageInfo(context); + String outputFilename = "temp-codegen-spring.srcjar"; + return Writer.write(context, clazzes, packageInfo, outputFilename, true); + } +} From a45fd18421507998f77fa9e68bcbab86161b0ea9 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 30 Aug 2022 21:00:18 +0000 Subject: [PATCH 027/103] back out changes to protowriter/Writer and creat a copy for Spring code. --- .../google/api/generator/gapic/Generator.java | 2 +- .../generator/gapic/protowriter/Writer.java | 28 +-- .../api/generator/spring/SpringGenerator.java | 3 +- .../api/generator/spring/SpringWriter.java | 176 ++++++++++++++++++ 4 files changed, 180 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/google/api/generator/spring/SpringWriter.java diff --git a/src/main/java/com/google/api/generator/gapic/Generator.java b/src/main/java/com/google/api/generator/gapic/Generator.java index 1b957c41cd..30658ff6a5 100644 --- a/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/src/main/java/com/google/api/generator/gapic/Generator.java @@ -30,6 +30,6 @@ public static CodeGeneratorResponse generateGapic(CodeGeneratorRequest request) List clazzes = Composer.composeServiceClasses(context); GapicPackageInfo packageInfo = Composer.composePackageInfo(context); String outputFilename = "temp-codegen.srcjar"; - return Writer.write(context, clazzes, packageInfo, outputFilename, false); + return Writer.write(context, clazzes, packageInfo, outputFilename); } } diff --git a/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java b/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java index 4595af28d9..35f9f21fdb 100644 --- a/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java +++ b/src/main/java/com/google/api/generator/gapic/protowriter/Writer.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.StringJoiner; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; @@ -47,8 +46,7 @@ public static CodeGeneratorResponse write( GapicContext context, List clazzes, GapicPackageInfo gapicPackageInfo, - String outputFilePath, - boolean isSpringContent) { + String outputFilePath) { ByteString.Output output = ByteString.newOutput(); JavaWriterVisitor codeWriter = new JavaWriterVisitor(); JarOutputStream jos; @@ -63,9 +61,7 @@ public static CodeGeneratorResponse write( writeSamples(gapicClazz, getSamplePackage(gapicClazz), classPath, jos); } - if (isSpringContent) { - writeSpringFactories(context, jos); - } + writeMetadataFile(context, writePackageInfo(gapicPackageInfo, codeWriter, jos), jos); try { jos.finish(); @@ -163,26 +159,6 @@ private static void writeMetadataFile(GapicContext context, String path, JarOutp } } - private static void writeSpringFactories(GapicContext context, JarOutputStream jos) { - String path = "src/main/resources/META-INF"; - JarEntry jarEntry = new JarEntry(String.format("%s/spring.factories", path)); - try { - jos.putNextEntry(jarEntry); - StringJoiner sb = - new StringJoiner( - ",\\\n", "org.springframework.boot.autoconfigure.EnableAutoConfiguration=\\\n", ""); - context - .services() - .forEach( - service -> - sb.add(String.format("com.sample.autoconfig.%sAutoConfig", service.name()))); - - jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); - } catch (IOException e) { - throw new GapicWriterException("Could not write spring.factories", e); - } - } - private static String getPath(String pakkage, String className) { String path = pakkage.replaceAll("\\.", "/"); if (className.startsWith("Mock") || className.endsWith("Test")) { diff --git a/src/main/java/com/google/api/generator/spring/SpringGenerator.java b/src/main/java/com/google/api/generator/spring/SpringGenerator.java index ad2b2e2d71..e2a2cac31c 100644 --- a/src/main/java/com/google/api/generator/spring/SpringGenerator.java +++ b/src/main/java/com/google/api/generator/spring/SpringGenerator.java @@ -19,7 +19,6 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.gapic.protoparser.Parser; -import com.google.api.generator.gapic.protowriter.Writer; import com.google.api.generator.spring.composer.SpringComposer; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; @@ -31,6 +30,6 @@ public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); GapicPackageInfo packageInfo = Composer.composePackageInfo(context); String outputFilename = "temp-codegen-spring.srcjar"; - return Writer.write(context, clazzes, packageInfo, outputFilename, true); + return SpringWriter.write(context, clazzes, packageInfo, outputFilename, true); } } diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java new file mode 100644 index 0000000000..0a0fe361ad --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -0,0 +1,176 @@ +// 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.spring; + +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.PackageInfoDefinition; +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.GapicPackageInfo; +import com.google.protobuf.ByteString; +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; +import com.google.protobuf.util.JsonFormat; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.StringJoiner; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; + +public class SpringWriter { + static class GapicWriterException extends RuntimeException { + + public GapicWriterException(String errorMessage, Throwable cause) { + super(errorMessage, cause); + } + } + + public static CodeGeneratorResponse write( + GapicContext context, + List clazzes, + GapicPackageInfo gapicPackageInfo, + String outputFilePath, + boolean isSpringContent) { + ByteString.Output output = ByteString.newOutput(); + JavaWriterVisitor codeWriter = new JavaWriterVisitor(); + JarOutputStream jos; + try { + jos = new JarOutputStream(output); + } catch (IOException e) { + throw new GapicWriterException(e.getMessage(), e); + } + + for (GapicClass gapicClazz : clazzes) { + String classPath = writeClazz(gapicClazz, codeWriter, jos); + // writeSamples(gapicClazz, getSamplePackage(gapicClazz), classPath, jos); + } + + // write spring.factories file + writeSpringFactories(context, jos); + + // TODO: metadata and package info not custimized for Spring + writeMetadataFile(context, writePackageInfo(gapicPackageInfo, codeWriter, jos), jos); + + try { + jos.finish(); + jos.flush(); + } catch (IOException e) { + throw new GapicWriterException(e.getMessage(), e); + } + + CodeGeneratorResponse.Builder response = CodeGeneratorResponse.newBuilder(); + response + .setSupportedFeatures(CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL_VALUE) + .addFileBuilder() + .setName(outputFilePath) + .setContentBytes(output.toByteString()); + return response.build(); + } + + private static String writeClazz( + GapicClass gapicClazz, JavaWriterVisitor codeWriter, JarOutputStream jos) { + ClassDefinition clazz = gapicClazz.classDefinition(); + + clazz.accept(codeWriter); + String code = codeWriter.write(); + codeWriter.clear(); + + String path = getPath(clazz.packageString(), clazz.classIdentifier().name()); + String className = clazz.classIdentifier().name(); + JarEntry jarEntry = new JarEntry(String.format("%s/%s.java", path, className)); + try { + jos.putNextEntry(jarEntry); + jos.write(code.getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException( + String.format( + "Could not write code for class %s.%s: %s", + clazz.packageString(), clazz.classIdentifier().name(), e.getMessage()), + e); + } + return path; + } + + private static String writePackageInfo( + GapicPackageInfo gapicPackageInfo, JavaWriterVisitor codeWriter, JarOutputStream jos) { + PackageInfoDefinition packageInfo = gapicPackageInfo.packageInfo(); + packageInfo.accept(codeWriter); + String code = codeWriter.write(); + codeWriter.clear(); + + String packagePath = "src/main/java/" + packageInfo.pakkage().replaceAll("\\.", "/"); + JarEntry jarEntry = new JarEntry(String.format("%s/package-info.java", packagePath)); + try { + jos.putNextEntry(jarEntry); + jos.write(code.getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write code for package-info.java", e); + } + return packagePath; + } + + private static void writeMetadataFile(GapicContext context, String path, JarOutputStream jos) { + if (context.gapicMetadataEnabled()) { + JarEntry jarEntry = new JarEntry(String.format("%s/gapic_metadata.json", path)); + try { + jos.putNextEntry(jarEntry); + jos.write( + JsonFormat.printer().print(context.gapicMetadata()).getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write gapic_metadata.json", e); + } + } + } + + private static void writeSpringFactories(GapicContext context, JarOutputStream jos) { + String path = "src/main/resources/META-INF"; + JarEntry jarEntry = new JarEntry(String.format("%s/spring.factories", path)); + try { + jos.putNextEntry(jarEntry); + StringJoiner sb = + new StringJoiner( + ",\\\n", "org.springframework.boot.autoconfigure.EnableAutoConfiguration=\\\n", ""); + context + .services() + .forEach( + service -> + sb.add(String.format("com.sample.autoconfig.%sAutoConfig", service.name()))); + + jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write spring.factories", e); + } + } + + private static String getPath(String pakkage, String className) { + String path = pakkage.replaceAll("\\.", "/"); + if (className.startsWith("Mock") || className.endsWith("Test")) { + path = "src/test/java/" + path; + } else { + path = "src/main/java/" + path; + } + + // Resource name helpers go into the protobuf package. Denote this with "proto/src/main/*". + if (className.endsWith("Name")) { + path = "proto/" + path; + } + return path; + } + + private static String getSamplePackage(GapicClass gapicClazz) { + return gapicClazz.classDefinition().packageString().concat(".samples"); + } +} From 899a4a7d59c24d7ba03a5542552d201ee513e2c8 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 31 Aug 2022 18:30:31 +0000 Subject: [PATCH 028/103] some cleanups: remove unused code, add comment reminder. --- .../SpringAutoConfigClassComposer.java | 25 ------------- .../SpringPropertiesClassComposer.java | 35 +------------------ .../api/generator/spring/composer/Utils.java | 2 ++ 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index a66de64246..9f8989ee5b 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -87,31 +87,6 @@ public GapicClass generate(GapicContext context, Service service) { GapicServiceConfig gapicServiceConfig = context.serviceConfig(); - // WIP: retry settings. - // for (Method method : service.methods()) { - // // do retry settings. - // - // Method.Stream streamKind = method.stream(); - // if (streamKind.equals(Method.Stream.CLIENT) || streamKind.equals(Method.Stream.BIDI)) { - // continue; - // } - // if (!Objects.isNull(gapicServiceConfig) - // && gapicServiceConfig.hasBatchingSetting(service, method)) { - // Optional batchingSettingOpt = - // gapicServiceConfig.getBatchingSetting(service, method); - // Preconditions.checkState( - // batchingSettingOpt.isPresent(), - // String.format( - // "No batching setting found for service %s, method %s", - // service.name(), method.name())); - // String settingsGetterMethodName = - // String.format("%sSettings", JavaStyle.toLowerCamelCase(method.name())); - // // bodyStatement.add(); - // - // String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); - // } - // } - types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); // header -- not used, add later diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 141311cc03..c9b37cb057 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -42,7 +42,6 @@ import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; -import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -55,8 +54,6 @@ public class SpringPropertiesClassComposer implements ClassComposer { private static final Map staticTypes = createStaticTypes(); private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS"; - private static final VariableExpr NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR = - createNestedRetryParamDefinitionsVarExpr(); private static final SpringPropertiesClassComposer INSTANCE = new SpringPropertiesClassComposer(); @@ -95,21 +92,6 @@ public GapicClass generate(GapicContext context, Service service) { // return null; } - private static VariableExpr createNestedRetryParamDefinitionsVarExpr() { - TypeNode varType = - TypeNode.withReference( - ConcreteReference.builder() - .setClazz(ImmutableMap.class) - .setGenerics( - Arrays.asList(TypeNode.STRING, staticTypes.get("RetrySettings")).stream() - .map(t -> t.reference()) - .collect(Collectors.toList())) - .build()); - - return VariableExpr.withVariable( - Variable.builder().setType(varType).setName(RETRY_PARAM_DEFINITIONS_VAR_NAME).build()); - } - private static ExprStatement createMemberVarStatement( String varName, TypeNode varType, boolean isFinal, Expr defaultVal) { Variable memberVar = Variable.builder().setName(varName).setType(varType).build(); @@ -172,22 +154,7 @@ private static List createMemberVariables( // // private static final ImmutableMap RETRY_PARAM_DEFINITIONS; - // // Declare the RETRY_PARAM_DEFINITIONS map. - // ExprStatement retryPramStatement = - // ExprStatement.withExpr( - // NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR - // .toBuilder() - // .setIsDecl(true) - // .setScope(ScopeNode.PRIVATE) - // .setIsStatic(true) - // .setIsFinal(true) - // .build()); - // - // BlockStatement retryParamDefinitionsBlock = - // RetrySettingsComposer.createRetryParamDefinitionsBlock( - // service, serviceConfig, NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR); - - // declare each retry settings with its default value. + // declare each retry settings with its default value. use defaults from serviceConfig TypeNode thisClassType = types.get(service.name() + "Properties"); List retrySettings = Utils.processRetrySettings( diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/composer/Utils.java index 3ff3436779..9264c44687 100644 --- a/src/main/java/com/google/api/generator/spring/composer/Utils.java +++ b/src/main/java/com/google/api/generator/spring/composer/Utils.java @@ -93,6 +93,8 @@ public static List processRetrySettings( processFunc.apply( methodName + "RpcTimeoutMultiplier", ValueExpr.withValue( + // this value is hardcoded in, risk of gapic- changes in future? + // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs PrimitiveValue.builder().setType(TypeNode.DOUBLE).setValue("1.0").build()))); if (!settings.kind().equals(GapicRetrySettings.Kind.NONE)) { From ee62131dda860f880078ba09fdae24f4fd4445dc Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 6 Sep 2022 19:16:03 +0000 Subject: [PATCH 029/103] Add let writer produce additional-spring-configuration-metadata.json. Also extracted method to gen spring property prefix string to util method, so all 3 occurances in sync. --- .../api/generator/spring/SpringWriter.java | 31 +++++++++++++++++++ .../SpringAutoConfigClassComposer.java | 10 ++++-- .../SpringPropertiesClassComposer.java | 4 +-- .../api/generator/spring/composer/Utils.java | 20 ++++++++++++ .../SpringAutoConfigClassComposerTest.java | 12 ++++--- .../generator/spring/SpringComposerTest.java | 2 +- 6 files changed, 68 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 0a0fe361ad..1a2568c195 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -20,6 +20,7 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; +import com.google.api.generator.spring.composer.Utils; import com.google.protobuf.ByteString; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import com.google.protobuf.util.JsonFormat; @@ -60,6 +61,7 @@ public static CodeGeneratorResponse write( // write spring.factories file writeSpringFactories(context, jos); + writeSpringAdditionalMetadataJson(context, jos); // TODO: metadata and package info not custimized for Spring writeMetadataFile(context, writePackageInfo(gapicPackageInfo, codeWriter, jos), jos); @@ -155,6 +157,35 @@ private static void writeSpringFactories(GapicContext context, JarOutputStream j } } + private static void writeSpringAdditionalMetadataJson(GapicContext context, JarOutputStream jos) { + String path = "src/main/resources/META-INF"; + JarEntry jarEntry = + new JarEntry(String.format("%s/additional-spring-configuration-metadata.json", path)); + String libName = Utils.getLibName(context); + try { + jos.putNextEntry(jarEntry); + StringJoiner sb = new StringJoiner(",\n", "\n{\n \"properties\": [\n", "\n ]\n" + "}"); + context + .services() + .forEach( + service -> + sb.add( + String.format( + " {\n" + + " \"name\": \"%s.enabled\",\n" + + " \"type\": \"java.lang.Boolean\",\n" + + " \"description\": \"Auto-configure Google Cloud %s components.\",\n" + + " \"defaultValue\": true\n" + + " }", + Utils.springPropertyPrefix(libName, service.name()), + libName + "/" + service.name()))); + + jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write spring.factories", e); + } + } + private static String getPath(String pakkage, String className) { String path = pakkage.replaceAll("\\.", "/"); if (className.startsWith("Mock") || className.endsWith("Test")) { diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 9f8989ee5b..659c1e4b5c 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -83,6 +83,7 @@ public GapicClass generate(GapicContext context, Service service) { String packageName = service.pakkage() + ".spring"; Map types = createDynamicTypes(service, packageName); String className = getThisClassName(service.name()); + String libName = Utils.getLibName(context); GapicClass.Kind kind = Kind.MAIN; GapicServiceConfig gapicServiceConfig = context.serviceConfig(); @@ -106,7 +107,7 @@ public GapicClass generate(GapicContext context, Service service) { createCredentialsProviderBeanMethod(service, className, types), createTransportChannelProviderBeanMethod(service, types), createClientBeanMethod(service, className, types))) - .setAnnotations(createClassAnnotations(service, types)) + .setAnnotations(createClassAnnotations(service, types, libName)) .build(); return GapicClass.create(kind, classDef); } @@ -392,7 +393,7 @@ private static MethodDefinition createConstructor( } private static List createClassAnnotations( - Service service, Map types) { + Service service, Map types, String libName) { // @Generated("by gapic-generator-java") // @Configuration(proxyBeanMethods = false) // @ConditionalOnClass(LanguageServiceClient.class) @@ -404,7 +405,10 @@ private static List createClassAnnotations( AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() .setType(types.get("ConditionalOnProperty")) - .setDescription("value = \"spring.cloud.gcp.language.enabled\", matchIfMissing = false") + .setDescription( + "value = \"" + + Utils.springPropertyPrefix(libName, service.name()) + + ".enabled\", matchIfMissing = false") .build(); AnnotationNode conditionalOnClassNode = AnnotationNode.builder() diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index c9b37cb057..3fb7f0195b 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -73,9 +73,7 @@ public GapicClass generate(GapicContext context, Service service) { AnnotationNode classAnnotationNode = AnnotationNode.builder() .setType(types.get("ConfigurationProperties")) - .setDescription( - "google.cloud.spring.autoconfig." - + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name())) + .setDescription(Utils.springPropertyPrefix(Utils.getLibName(context), service.name())) .build(); ClassDefinition classDef = diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/composer/Utils.java index 9264c44687..bf0a350ce0 100644 --- a/src/main/java/com/google/api/generator/spring/composer/Utils.java +++ b/src/main/java/com/google/api/generator/spring/composer/Utils.java @@ -21,12 +21,14 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.ast.ValueExpr; import com.google.api.generator.gapic.composer.store.TypeStore; +import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicRetrySettings; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; +import com.google.common.base.Splitter; import com.google.protobuf.Duration; import com.google.protobuf.util.Durations; import io.grpc.serviceconfig.MethodConfig.RetryPolicy; @@ -38,6 +40,24 @@ public class Utils { private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); + private static final String BRAND_NAME = "spring.cloud.gcp"; + + public static String getLibName(GapicContext context) { + String pakkageName = context.services().get(0).pakkage(); + List pakkagePhrases = Splitter.on(".").splitToList(pakkageName); + // TODO: confirm if this is guaranteed pattern: xx.[...].xx.lib-name.v[version] + // eg. for vision proto: "com.google.cloud.vision.v1" + // https://github.com/googleapis/java-vision/blob/main/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto#L36 + return pakkagePhrases.get(pakkagePhrases.size() - 2); + } + + public static String springPropertyPrefix(String libName, String serviceName) { + return "spring.cloud.gcp.autoconfig." + + CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_HYPHEN, libName) + + "." + + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); + } + public static List processRetrySettings( Service service, GapicServiceConfig gapicServiceConfig, diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index f17403c95f..1651f77edb 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -50,6 +50,9 @@ public class SpringAutoConfigClassComposerTest { @Before public void setUp() { echoFileDescriptor = EchoOuterClass.getDescriptor(); + + ServiceDescriptor serviceDescriptor = echoFileDescriptor.getServices().get(0); + // Assert.assertEquals(serviceDescriptor.getName(), "Bookshop"); echoService = echoFileDescriptor.getServices().get(0); assertEquals(echoService.getName(), "Echo"); } @@ -86,7 +89,7 @@ public void generateAutoConfigClasses() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); - assertEquals(EXPECTED_CLASS_STRING, visitor.write()); + assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); } @Test @@ -126,7 +129,7 @@ public void generatePropertiesTest() { assertEquals(EXPECTED_PROPERTY_CLASS_STRING, visitor.write()); } - protected static final String EXPECTED_CLASS_STRING = + protected static final String EXPECTED_AUTOCONFIG_CLASS_STRING = "package com.google.showcase.v1beta1.spring;\n" + "\n" + "import com.google.api.gax.core.CredentialsProvider;\n" @@ -150,7 +153,8 @@ public void generatePropertiesTest() { + "@Generated(\"by gapic-generator-java\")\n" + "@Configuration(\"proxyBeanMethods = false\")\n" + "@ConditionalOnClass(\"value = EchoClient.class\")\n" - + "@ConditionalOnProperty(\"value = \\\"spring.cloud.gcp.language.enabled\\\", matchIfMissing = false\")\n" + + "@ConditionalOnProperty(\n" + + " \"value = \\\"spring.cloud.gcp.autoconfig.showcase.echo.enabled\\\", matchIfMissing = false\")\n" + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + "public class EchoSpringAutoConfiguration {\n" + " private final EchoSpringProperties clientProperties;\n" @@ -218,7 +222,7 @@ public void generatePropertiesTest() { + "import org.springframework.boot.context.properties.ConfigurationProperties;\n" + "import org.threeten.bp.Duration;\n" + "\n" - + "@ConfigurationProperties(\"google.cloud.spring.autoconfig.echo\")\n" + + "@ConfigurationProperties(\"spring.cloud.gcp.autoconfig.showcase.echo\")\n" + "public class EchoSpringProperties implements CredentialsSupplier {\n" + " private final Credentials credentials =\n" + " new Credentials(\"https://www.googleapis.com/auth/cloud-platform\");\n" diff --git a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java index c666e084c0..bc3525d8db 100644 --- a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java @@ -63,7 +63,7 @@ public class SpringComposerTest { + " * limitations under the License.\n" + " */\n" + "\n" - + SpringAutoConfigClassComposerTest.EXPECTED_CLASS_STRING; + + SpringAutoConfigClassComposerTest.EXPECTED_AUTOCONFIG_CLASS_STRING; @Before public void setUp() { From fe5baf19a22b72ddfbf23c2843c144a94de1fb86 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 7 Sep 2022 14:17:40 +0000 Subject: [PATCH 030/103] fix spring.factories package name. fix transport condition to gen spring code. --- .../java/com/google/api/generator/spring/SpringWriter.java | 4 +++- .../google/api/generator/spring/composer/SpringComposer.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 1a2568c195..1d6f65fe31 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -149,7 +149,9 @@ private static void writeSpringFactories(GapicContext context, JarOutputStream j .services() .forEach( service -> - sb.add(String.format("com.sample.autoconfig.%sAutoConfig", service.name()))); + sb.add( + String.format( + "%s.spring.%sSpringAutoConfig", service.pakkage(), service.name()))); jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index 673064ee7c..d05eda85ca 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -37,7 +37,8 @@ protected static List generateClientAutoConfig(GapicContext context) .services() .forEach( s -> { - if (context.transport() == Transport.GRPC) { + if (context.transport() == Transport.GRPC + || context.transport() == Transport.GRPC_REST) { clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s)); // clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s)); } From de183ed322c1e5863eb4533b0f096cd35bb55b5e Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 7 Sep 2022 19:29:56 +0000 Subject: [PATCH 031/103] messy wip. adding retry settings with null check to autoconfig. --- .../SpringAutoConfigClassComposer.java | 331 +++++++++++++++++- .../SpringPropertiesClassComposer.java | 15 +- .../api/generator/spring/composer/Utils.java | 20 +- .../SpringAutoConfigClassComposerTest.java | 2 +- 4 files changed, 342 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 659c1e4b5c..7f87867d2a 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -50,6 +50,7 @@ import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.ArrayList; @@ -106,7 +107,7 @@ public GapicClass generate(GapicContext context, Service service) { createConstructor(service.name(), className, types), createCredentialsProviderBeanMethod(service, className, types), createTransportChannelProviderBeanMethod(service, types), - createClientBeanMethod(service, className, types))) + createClientBeanMethod(service, className, types, gapicServiceConfig))) .setAnnotations(createClassAnnotations(service, types, libName)) .build(); return GapicClass.create(kind, classDef); @@ -525,8 +526,106 @@ private static IfStatement createIfStatement( return credentialIfStatement.build(); } + private static Statement createRetrySettingBuilderForMethod( + String methodName, Variable settingBuilderVariable) { + // RetrySettings.Builder annotateTextRetrySettingsBuilder = + // clientSettingsBuilder.annotateTextSettings() + // .getRetrySettings() + // .toBuilder(); + Variable retrySettingBuilderVariable = + Variable.builder() + .setName(String.format("%sRetrySettingBuilder", methodName)) + .setType(STATIC_TYPES.get("Builder")) + .build(); + VariableExpr retrySettingsVarExpr = + VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build(); + MethodInvocationExpr clientSettingBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName(String.format("%sSettings", methodName)) + .build(); + clientSettingBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(clientSettingBuilderChain) + .setMethodName("getRetrySettings") + .build(); + clientSettingBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(clientSettingBuilderChain) + .setMethodName("toBuilder") + .setReturnType(STATIC_TYPES.get("Builder")) + .build(); + AssignmentExpr retrySettingCreateExpr = + AssignmentExpr.builder() + .setVariableExpr(retrySettingsVarExpr) + .setValueExpr(clientSettingBuilderChain) + .build(); + + return ExprStatement.withExpr(retrySettingCreateExpr); + } + + private static Statement setRetrySettingsForMethod( + String methodName, Variable settingBuilderVariable) { + // clientSettingsBuilder.annotateTextSettings() + // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); + + // RetrySettings.Builder annotateTextRetrySettingsBuilder = + // clientSettingsBuilder.annotateTextSettings() + // .getRetrySettings() + // .toBuilder(); + // Variable retrySettingBuilderVariable = + // Variable.builder() + // .setName(String.format("%sRetrySettingBuilder", methodName)) + // .setType(STATIC_TYPES.get("Builder")) + // .build(); + // VariableExpr retrySettingsVarExpr = + // + // VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build(); + MethodInvocationExpr clientSettingBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName(String.format("%sSettings", methodName)) + .build(); + + // annotateTextRetrySettingsBuilder.build() + Variable retrySettingBuilderVariable = + Variable.builder() + .setName(String.format("%sRetrySettingBuilder", methodName)) // extract method name + .setType(STATIC_TYPES.get("Builder")) + .build(); + MethodInvocationExpr retrySettingsBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(retrySettingBuilderVariable)) + .setMethodName("build") + .build(); + + clientSettingBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(clientSettingBuilderChain) + .setMethodName("setRetrySettings") + .setArguments(retrySettingsBuilderChain) + .build(); + + // clientSettingBuilderChain = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(clientSettingBuilderChain) + // .setMethodName("toBuilder") + // .setReturnType(STATIC_TYPES.get("Builder")) + // .build(); + // AssignmentExpr retrySettingCreateExpr = + // AssignmentExpr.builder() + // .setVariableExpr(retrySettingsVarExpr) + // .setValueExpr(clientSettingBuilderChain) + // .build(); + + return ExprStatement.withExpr(clientSettingBuilderChain); + } + private static MethodDefinition createClientBeanMethod( - Service service, String className, Map types) { + Service service, + String className, + Map types, + GapicServiceConfig gapicServiceConfig) { // argument variables: VariableExpr credentialsProviderVariableExpr = @@ -593,6 +692,44 @@ private static MethodDefinition createClientBeanMethod( bodyStatements.add(ExprStatement.withExpr(settingCreateExpr)); + // [RetrySettings.Builder methodNameRetrySettingBuilder = + // clientSettingsBuilder.methodNameSettings().getRetrySettings().toBuilder(); + // bodyStatements.add(createRetrySettingBuilderForMethod("methodName", settingBuilderVariable)); + // // RetrySettings.Builder annotateTextRetrySettingsBuilder = + // clientSettingsBuilder.annotateTextSettings() + // // .getRetrySettings() + // // .toBuilder(); + // Variable retrySettingBuilderVariable = + // Variable.builder() + // .setName(String.format("%sRetrySettingBuilder", "methodName")) + // .setType(STATIC_TYPES.get("Builder")) + // .build(); + // VariableExpr retrySettingsVarExpr = + // + // VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build(); + // MethodInvocationExpr clientSettingBuilderChain = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + // .setMethodName(String.format("%sSettings", "methodName")) + // .build(); + // clientSettingBuilderChain = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(clientSettingBuilderChain) + // .setMethodName("getRetrySettings") + // .build(); + // clientSettingBuilderChain = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(clientSettingBuilderChain) + // .setMethodName("toBuilder") + // .setReturnType(STATIC_TYPES.get("Builder")) + // .build(); + // AssignmentExpr retrySettingCreateExpr = + // AssignmentExpr.builder() + // .setVariableExpr(retrySettingsVarExpr) + // .setValueExpr(clientSettingBuilderChain) + // .build(); + // bodyStatements.add(ExprStatement.withExpr(retrySettingCreateExpr)); + // if (this.clientProperties.getQuotaProjectId() != null) { // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() @@ -737,21 +874,177 @@ private static MethodDefinition createClientBeanMethod( bodyStatements.add(setTransportChannelProviderStatement); // TODO: retry settings for each method - // RetrySettings annotateTextSettingsRetrySettings = + // // safer (in case of version mismatch b/w spring-autoconfig & client lib) + // // to not set defaults in properties, only modify value if property is set. + // RetrySettings.Builder annotateTextRetrySettingsBuilder = // clientSettingsBuilder.annotateTextSettings() // .getRetrySettings() - // .toBuilder() - // .setInitialRetryDelay(this.clientProperties.getAnnotateTextMaxRetryDelay()) - // .setRetryDelayMultiplier(this.clientProperties.getAnnotateTextRpcTimeoutMultiplier()) - // .setMaxRetryDelay(this.clientProperties.getAnnotateTextMaxRetryDelay()) - // .setInitialRpcTimeout(this.clientProperties.getAnnotateTextInitialRpcTimeout()) - // .setRpcTimeoutMultiplier(this.clientProperties.getAnnotateTextRpcTimeoutMultiplier()) - // .setMaxRpcTimeout(this.clientProperties.getAnnotateTextMaxRpcTimeout()) - // .setTotalTimeout(this.clientProperties.getAnnotateTextTotalTimeout()) - // .build(); + // .toBuilder(); + // + // if (this.clientProperties.getAnnotateTextInitialRetryDelay() != null) { + // + // annotateTextRetrySettingsBuilder.setInitialRetryDelay(this.clientProperties.getAnnotateTextInitialRetryDelay()); + // } + // if (this.clientProperties.getAnnotateTextRetryDelayMultiplier() != null) { + // + // annotateTextRetrySettingsBuilder.setRetryDelayMultiplier(this.clientProperties.getAnnotateTextRetryDelayMultiplier()); + // } + // // ... // clientSettingsBuilder.annotateTextSettings() - // .setRetrySettings(annotateTextSettingsRetrySettings); - + // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); + TypeNode thisClassType = types.get(service.name() + "AutoConfig"); + List retrySettings = + Utils.processRetrySettings( + service, + gapicServiceConfig, + thisClassType, + (String methodName) -> { + List statements = new ArrayList<>(); + statements.add( + createRetrySettingBuilderForMethod(methodName, settingBuilderVariable)); + return statements; + }, + (List methodAndPropertyName, Expr defaultVal) -> { + // return new ArrayList<>(); + List statements = new ArrayList<>(); + String methodName = methodAndPropertyName.get(0); + String settingName = methodAndPropertyName.get(1); // safe guard?? + String propertyName = + CaseFormat.LOWER_CAMEL.to( + CaseFormat.UPPER_CAMEL, Joiner.on("").join(methodAndPropertyName)); + // if (this.clientProperties.getAnnotateTextInitialRetryDelay() != null) { + // + // annotateTextRetrySettingsBuilder.setInitialRetryDelay(this.clientProperties.getAnnotateTextInitialRetryDelay()); + // } + + // this.clientProperties.getQuotaProjectId() != null + + TypeNode propertyType = defaultVal.type(); + if (propertyType.equals(TypeNode.DOUBLE)) { + propertyType = TypeNode.DOUBLE_OBJECT; + } + // String methodName = "get" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, + // propertyName); + MethodInvocationExpr currentRetrySettingProperty = + MethodInvocationExpr.builder() + .setMethodName(String.format("get%s", propertyName)) + .setReturnType(propertyType) + .setExprReferenceExpr(thisClientPropertiesVarExpr) + .build(); + RelationalOperationExpr currentRetrySettingPropertyIsNull = + RelationalOperationExpr.notEqualToWithExprs( + currentRetrySettingProperty, ValueExpr.createNullExpr()); + + // annotateTextRetrySettingsBuilder.setInitialRetryDelay(this.clientProperties.getAnnotateTextInitialRetryDelay()); + Variable retrySettingBuilderVariable = + Variable.builder() + .setName( + String.format("%sRetrySettingBuilder", methodName)) // extract method name + .setType(STATIC_TYPES.get("Builder")) + .build(); + MethodInvocationExpr retrySettingsBuilderChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(retrySettingBuilderVariable)) + .setMethodName(String.format("set%s", settingName)) + .setArguments(currentRetrySettingProperty) + .build(); + + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + // MethodInvocationExpr setQuotaProjectId = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + // .setMethodName("setQuotaProjectId") + // .setArguments(getQuotaProjectId) + // .build(); + + IfStatement currentRetrySettingPropertyIfStatement = + createIfStatement( + currentRetrySettingPropertyIsNull, + Arrays.asList(ExprStatement.withExpr(retrySettingsBuilderChain)), + null); + statements.add(currentRetrySettingPropertyIfStatement); + return statements; + // // if (this.clientProperties.getQuotaProjectId() != null) { + // // + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + // // LOGGER.info("Quota project id set to: " + + // clientProperties.getQuotaProjectId() + // // + ", this overrides project id from credentials."); + // // } + // Expr thisExpr = + // ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); + // Variable clientPropertiesVar = + // Variable.builder() + // .setName("clientProperties") + // .setType(types.get(service.name() + "Properties")) + // .build(); + // VariableExpr thisClientPropertiesVarExpr = + // VariableExpr.withVariable(clientPropertiesVar) + // .toBuilder() + // .setExprReferenceExpr(thisExpr) + // .build(); + // + // MethodInvocationExpr getQuotaProjectId = + // MethodInvocationExpr.builder() + // .setMethodName("getQuotaProjectId") + // .setReturnType(TypeNode.STRING) + // .setExprReferenceExpr(thisClientPropertiesVarExpr) + // .build(); + // RelationalOperationExpr projectIdIsNull = + // RelationalOperationExpr.notEqualToWithExprs(getQuotaProjectId, + // ValueExpr.createNullExpr()); + // + // // + // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); + // MethodInvocationExpr setQuotaProjectId = + // MethodInvocationExpr.builder() + // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + // .setMethodName("setQuotaProjectId") + // .setArguments(getQuotaProjectId) + // .build(); + // + // IfStatement setQuotaProjectIdStatement = + // createIfStatement( + // projectIdIsNull, + // Arrays.asList(ExprStatement.withExpr(setQuotaProjectId)), // TODO add + // logger info + // null); + + // List getterAndSetter = new ArrayList<>(); + // TypeNode propertyType = defaultVal.type(); + // Variable propertyVar = + // Variable.builder().setName(propertyName).setType(propertyType).build(); + // Expr thisExpr1 = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); + // + // VariableExpr propertyVariableExpr = + // + // VariableExpr.withVariable(propertyVar).toBuilder().setExprReferenceExpr(thisExpr1).build(); + // + // String methodName = "get" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, + // propertyName); + // + // getterAndSetter.add( MethodDefinition.builder() + // .setName(methodName) + // .setScope(ScopeNode.PUBLIC) + // .setReturnType(propertyType) + // .setReturnExpr(propertyVariableExpr) + // .build()); + // // getterAndSetter.add( + // // + // // createGetterMethod(thisClassType, propertyName, propertyType, null)); + // // getterAndSetter.add(createSetterMethod(thisClassType, propertyName, + // propertyType)); + // return getterAndSetter; + }, + // + // clientSettingsBuilder.annotateTextSettings() + // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); + (String methodName) -> { + List statements = new ArrayList<>(); + statements.add(setRetrySettingsForMethod(methodName, settingBuilderVariable)); + return statements; + }); + bodyStatements.addAll(retrySettings); // return expressions MethodInvocationExpr serviceSettingsBuilt = MethodInvocationExpr.builder() @@ -797,6 +1090,8 @@ private static Map createStaticTypes() { Arrays.asList( Generated.class, RetrySettings.class, + RetrySettings.Builder + .class, // name will be just Builder. consider change of more than one builder here. TransportChannelProvider.class, // import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; InstantiatingHttpJsonChannelProvider.class, @@ -833,6 +1128,13 @@ private static Map createDynamicTypes(Service service, String .setPakkage(packageName) .build()); + TypeNode clientAutoconfig = + TypeNode.withReference( + VaporReference.builder() + .setName(service.name() + "SpringAutoConfig") + .setPakkage(packageName) + .build()); + TypeNode gcpProjectIdProvider = TypeNode.withReference( VaporReference.builder() @@ -923,6 +1225,7 @@ private static Map createDynamicTypes(Service service, String typeMap.put("CredentialsProvider", credentialsProvider); typeMap.put(service.name() + "Properties", clientProperties); + typeMap.put(service.name() + "AutoConfig", clientAutoconfig); typeMap.put("GcpProjectIdProvider", gcpProjectIdProvider); typeMap.put("Credentials", credentials); typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 3fb7f0195b..da73d6437e 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -42,6 +42,7 @@ import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; +import com.google.common.base.Joiner; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -159,14 +160,17 @@ private static List createMemberVariables( service, serviceConfig, thisClassType, - (String propertyName, Expr defaultVal) -> { + (String propertyName) -> new ArrayList<>(), + (List methodAndPropertyName, Expr defaultVal) -> { List getterAndSetter = new ArrayList<>(); TypeNode propertyType = defaultVal.type(); + String propertyName = Joiner.on("").join(methodAndPropertyName); ExprStatement retrySettingsStatement = createMemberVarStatement(propertyName, propertyType, false, defaultVal); getterAndSetter.add(retrySettingsStatement); return getterAndSetter; - }); + }, + (String propertyName) -> new ArrayList<>()); List statements = retrySettings.stream().map(x -> (Statement) x).collect(Collectors.toList()); @@ -204,14 +208,17 @@ private static List createGetterSetters( service, gapicServiceConfig, thisClassType, - (String propertyName, Expr defaultVal) -> { + (String propertyName) -> new ArrayList<>(), + (List methodAndPropertyName, Expr defaultVal) -> { List getterAndSetter = new ArrayList<>(); TypeNode propertyType = defaultVal.type(); + String propertyName = Joiner.on("").join(methodAndPropertyName); getterAndSetter.add( createGetterMethod(thisClassType, propertyName, propertyType, null)); getterAndSetter.add(createSetterMethod(thisClassType, propertyName, propertyType)); return getterAndSetter; - }); + }, + (String propertyName) -> new ArrayList<>()); methodDefinitions.addAll(retrySettings); // TODO: This can be for future stages. for long running operations: diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/composer/Utils.java index bf0a350ce0..e8194a8f43 100644 --- a/src/main/java/com/google/api/generator/spring/composer/Utils.java +++ b/src/main/java/com/google/api/generator/spring/composer/Utils.java @@ -36,6 +36,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.BiFunction; +import java.util.function.Function; public class Utils { private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); @@ -62,11 +63,14 @@ public static List processRetrySettings( Service service, GapicServiceConfig gapicServiceConfig, TypeNode thisClassType, - BiFunction> processFunc) { + Function> perMethodFuncBeforeSettings, + BiFunction, Expr, List> processFunc, + Function> perMethodFuncAfterSettings) { List resultList = new ArrayList<>(); for (Method method : service.methods()) { String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, method.name()); String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); + resultList.addAll(perMethodFuncBeforeSettings.apply(methodName)); // follow logic in: // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs // Build the settings object for each config. @@ -82,12 +86,12 @@ public static List processRetrySettings( resultList.addAll( processFunc.apply( - methodName + "InitialRetryDelay", + Arrays.asList(methodName, "InitialRetryDelay"), createDurationOfMillisExpr(toValExpr(retryPolicy.getInitialBackoff())))); resultList.addAll( processFunc.apply( - methodName + "RetryDelayMultiplier", + Arrays.asList(methodName, "RetryDelayMultiplier"), toValExpr(retryPolicy.getBackoffMultiplier()))); Preconditions.checkState( @@ -96,7 +100,7 @@ public static List processRetrySettings( resultList.addAll( processFunc.apply( - methodName + "MaxRetryDelay", + Arrays.asList(methodName, "MaxRetryDelay"), createDurationOfMillisExpr(toValExpr(retryPolicy.getMaxBackoff())))); } @@ -104,14 +108,14 @@ public static List processRetrySettings( resultList.addAll( processFunc.apply( - methodName + "InitialRpcTimeout", + Arrays.asList(methodName, "InitialRpcTimeout"), createDurationOfMillisExpr(toValExpr(settings.timeout())))); } // This will always be done, no matter the type of the retry settings object. resultList.addAll( processFunc.apply( - methodName + "RpcTimeoutMultiplier", + Arrays.asList(methodName, "RpcTimeoutMultiplier"), ValueExpr.withValue( // this value is hardcoded in, risk of gapic- changes in future? // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createRetrySettingsExprs @@ -122,10 +126,12 @@ public static List processRetrySettings( resultList.addAll( processFunc.apply( - methodName + setterMethodName, + Arrays.asList(methodName, setterMethodName), createDurationOfMillisExpr(toValExpr(settings.timeout())))); } } + + resultList.addAll(perMethodFuncAfterSettings.apply(methodName)); } return resultList; } diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 1651f77edb..6990dceb23 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -89,7 +89,7 @@ public void generateAutoConfigClasses() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); - assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); + // assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); } @Test From db5af15e17ddb796f6294abf07ffda4619ea4082 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 7 Sep 2022 20:30:50 +0000 Subject: [PATCH 032/103] complete retry settings in autoconfig and changes in properties. clean-ups. --- .../SpringAutoConfigClassComposer.java | 175 +---------------- .../SpringPropertiesClassComposer.java | 6 +- .../SpringAutoConfigClassComposerTest.java | 182 +++++++++++++----- .../generator/spring/SpringComposerTest.java | 2 +- 4 files changed, 138 insertions(+), 227 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 7f87867d2a..fe33bbdfb9 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -569,18 +569,6 @@ private static Statement setRetrySettingsForMethod( // clientSettingsBuilder.annotateTextSettings() // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); - // RetrySettings.Builder annotateTextRetrySettingsBuilder = - // clientSettingsBuilder.annotateTextSettings() - // .getRetrySettings() - // .toBuilder(); - // Variable retrySettingBuilderVariable = - // Variable.builder() - // .setName(String.format("%sRetrySettingBuilder", methodName)) - // .setType(STATIC_TYPES.get("Builder")) - // .build(); - // VariableExpr retrySettingsVarExpr = - // - // VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build(); MethodInvocationExpr clientSettingBuilderChain = MethodInvocationExpr.builder() .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) @@ -606,18 +594,6 @@ private static Statement setRetrySettingsForMethod( .setArguments(retrySettingsBuilderChain) .build(); - // clientSettingBuilderChain = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(clientSettingBuilderChain) - // .setMethodName("toBuilder") - // .setReturnType(STATIC_TYPES.get("Builder")) - // .build(); - // AssignmentExpr retrySettingCreateExpr = - // AssignmentExpr.builder() - // .setVariableExpr(retrySettingsVarExpr) - // .setValueExpr(clientSettingBuilderChain) - // .build(); - return ExprStatement.withExpr(clientSettingBuilderChain); } @@ -692,44 +668,6 @@ private static MethodDefinition createClientBeanMethod( bodyStatements.add(ExprStatement.withExpr(settingCreateExpr)); - // [RetrySettings.Builder methodNameRetrySettingBuilder = - // clientSettingsBuilder.methodNameSettings().getRetrySettings().toBuilder(); - // bodyStatements.add(createRetrySettingBuilderForMethod("methodName", settingBuilderVariable)); - // // RetrySettings.Builder annotateTextRetrySettingsBuilder = - // clientSettingsBuilder.annotateTextSettings() - // // .getRetrySettings() - // // .toBuilder(); - // Variable retrySettingBuilderVariable = - // Variable.builder() - // .setName(String.format("%sRetrySettingBuilder", "methodName")) - // .setType(STATIC_TYPES.get("Builder")) - // .build(); - // VariableExpr retrySettingsVarExpr = - // - // VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build(); - // MethodInvocationExpr clientSettingBuilderChain = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) - // .setMethodName(String.format("%sSettings", "methodName")) - // .build(); - // clientSettingBuilderChain = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(clientSettingBuilderChain) - // .setMethodName("getRetrySettings") - // .build(); - // clientSettingBuilderChain = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(clientSettingBuilderChain) - // .setMethodName("toBuilder") - // .setReturnType(STATIC_TYPES.get("Builder")) - // .build(); - // AssignmentExpr retrySettingCreateExpr = - // AssignmentExpr.builder() - // .setVariableExpr(retrySettingsVarExpr) - // .setValueExpr(clientSettingBuilderChain) - // .build(); - // bodyStatements.add(ExprStatement.withExpr(retrySettingCreateExpr)); - // if (this.clientProperties.getQuotaProjectId() != null) { // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() @@ -872,26 +810,8 @@ private static MethodDefinition createClientBeanMethod( getUseRest, Arrays.asList(ExprStatement.withExpr(setTransportProvider)), null); bodyStatements.add(setTransportChannelProviderStatement); - // TODO: retry settings for each method - // // safer (in case of version mismatch b/w spring-autoconfig & client lib) - // // to not set defaults in properties, only modify value if property is set. - // RetrySettings.Builder annotateTextRetrySettingsBuilder = - // clientSettingsBuilder.annotateTextSettings() - // .getRetrySettings() - // .toBuilder(); - // - // if (this.clientProperties.getAnnotateTextInitialRetryDelay() != null) { - // - // annotateTextRetrySettingsBuilder.setInitialRetryDelay(this.clientProperties.getAnnotateTextInitialRetryDelay()); - // } - // if (this.clientProperties.getAnnotateTextRetryDelayMultiplier() != null) { - // - // annotateTextRetrySettingsBuilder.setRetryDelayMultiplier(this.clientProperties.getAnnotateTextRetryDelayMultiplier()); - // } - // // ... - // clientSettingsBuilder.annotateTextSettings() - // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); + // retry settings for each method TypeNode thisClassType = types.get(service.name() + "AutoConfig"); List retrySettings = Utils.processRetrySettings( @@ -912,19 +832,11 @@ private static MethodDefinition createClientBeanMethod( String propertyName = CaseFormat.LOWER_CAMEL.to( CaseFormat.UPPER_CAMEL, Joiner.on("").join(methodAndPropertyName)); - // if (this.clientProperties.getAnnotateTextInitialRetryDelay() != null) { - // - // annotateTextRetrySettingsBuilder.setInitialRetryDelay(this.clientProperties.getAnnotateTextInitialRetryDelay()); - // } - - // this.clientProperties.getQuotaProjectId() != null TypeNode propertyType = defaultVal.type(); if (propertyType.equals(TypeNode.DOUBLE)) { propertyType = TypeNode.DOUBLE_OBJECT; } - // String methodName = "get" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, - // propertyName); MethodInvocationExpr currentRetrySettingProperty = MethodInvocationExpr.builder() .setMethodName(String.format("get%s", propertyName)) @@ -949,14 +861,6 @@ private static MethodDefinition createClientBeanMethod( .setArguments(currentRetrySettingProperty) .build(); - // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); - // MethodInvocationExpr setQuotaProjectId = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) - // .setMethodName("setQuotaProjectId") - // .setArguments(getQuotaProjectId) - // .build(); - IfStatement currentRetrySettingPropertyIfStatement = createIfStatement( currentRetrySettingPropertyIsNull, @@ -964,87 +868,14 @@ private static MethodDefinition createClientBeanMethod( null); statements.add(currentRetrySettingPropertyIfStatement); return statements; - // // if (this.clientProperties.getQuotaProjectId() != null) { - // // - // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); - // // LOGGER.info("Quota project id set to: " + - // clientProperties.getQuotaProjectId() - // // + ", this overrides project id from credentials."); - // // } - // Expr thisExpr = - // ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); - // Variable clientPropertiesVar = - // Variable.builder() - // .setName("clientProperties") - // .setType(types.get(service.name() + "Properties")) - // .build(); - // VariableExpr thisClientPropertiesVarExpr = - // VariableExpr.withVariable(clientPropertiesVar) - // .toBuilder() - // .setExprReferenceExpr(thisExpr) - // .build(); - // - // MethodInvocationExpr getQuotaProjectId = - // MethodInvocationExpr.builder() - // .setMethodName("getQuotaProjectId") - // .setReturnType(TypeNode.STRING) - // .setExprReferenceExpr(thisClientPropertiesVarExpr) - // .build(); - // RelationalOperationExpr projectIdIsNull = - // RelationalOperationExpr.notEqualToWithExprs(getQuotaProjectId, - // ValueExpr.createNullExpr()); - // - // // - // clientSettingsBuilder.setQuotaProjectId(clientProperties.getQuotaProjectId()); - // MethodInvocationExpr setQuotaProjectId = - // MethodInvocationExpr.builder() - // .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) - // .setMethodName("setQuotaProjectId") - // .setArguments(getQuotaProjectId) - // .build(); - // - // IfStatement setQuotaProjectIdStatement = - // createIfStatement( - // projectIdIsNull, - // Arrays.asList(ExprStatement.withExpr(setQuotaProjectId)), // TODO add - // logger info - // null); - - // List getterAndSetter = new ArrayList<>(); - // TypeNode propertyType = defaultVal.type(); - // Variable propertyVar = - // Variable.builder().setName(propertyName).setType(propertyType).build(); - // Expr thisExpr1 = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); - // - // VariableExpr propertyVariableExpr = - // - // VariableExpr.withVariable(propertyVar).toBuilder().setExprReferenceExpr(thisExpr1).build(); - // - // String methodName = "get" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, - // propertyName); - // - // getterAndSetter.add( MethodDefinition.builder() - // .setName(methodName) - // .setScope(ScopeNode.PUBLIC) - // .setReturnType(propertyType) - // .setReturnExpr(propertyVariableExpr) - // .build()); - // // getterAndSetter.add( - // // - // // createGetterMethod(thisClassType, propertyName, propertyType, null)); - // // getterAndSetter.add(createSetterMethod(thisClassType, propertyName, - // propertyType)); - // return getterAndSetter; }, - // - // clientSettingsBuilder.annotateTextSettings() - // .setRetrySettings(annotateTextRetrySettingsBuilder.build()); (String methodName) -> { List statements = new ArrayList<>(); statements.add(setRetrySettingsForMethod(methodName, settingBuilderVariable)); return statements; }); bodyStatements.addAll(retrySettings); + // return expressions MethodInvocationExpr serviceSettingsBuilt = MethodInvocationExpr.builder() @@ -1054,7 +885,6 @@ private static MethodDefinition createClientBeanMethod( .build(); MethodInvocationExpr returnExpr = MethodInvocationExpr.builder() - // TODO: might need to use newBuilder().build() if options needed. // read more in client composer: // src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java#L277-L292 .setMethodName("create") @@ -1081,7 +911,6 @@ private static MethodDefinition createClientBeanMethod( .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .setReturnExpr(returnExpr) .setBody(bodyStatements) - // bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList())) .build(); } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index da73d6437e..35f30a40a6 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -164,9 +164,13 @@ private static List createMemberVariables( (List methodAndPropertyName, Expr defaultVal) -> { List getterAndSetter = new ArrayList<>(); TypeNode propertyType = defaultVal.type(); + // TODO: safer cast? + if (propertyType.equals(TypeNode.DOUBLE)) { + propertyType = TypeNode.DOUBLE_OBJECT; + } String propertyName = Joiner.on("").join(methodAndPropertyName); ExprStatement retrySettingsStatement = - createMemberVarStatement(propertyName, propertyType, false, defaultVal); + createMemberVarStatement(propertyName, propertyType, false, null); getterAndSetter.add(retrySettingsStatement); return getterAndSetter; }, diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 6990dceb23..d31a8e4b03 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -89,7 +89,7 @@ public void generateAutoConfigClasses() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); - // assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); + assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); } @Test @@ -210,6 +210,84 @@ public void generatePropertiesTest() { + " clientSettingsBuilder.setTransportChannelProvider(\n" + " EchoSettings.defaultHttpJsonTransportProviderBuilder().build());\n" + " }\n" + + " RetrySettings.Builder echoRetrySettingBuilder =\n" + + " clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {\n" + + " echoRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getEchoRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());\n" + + " RetrySettings.Builder expandRetrySettingBuilder =\n" + + " clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {\n" + + " expandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getExpandRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());\n" + + " RetrySettings.Builder collectRetrySettingBuilder =\n" + + " clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {\n" + + " collectRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getCollectRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());\n" + + " RetrySettings.Builder chatRetrySettingBuilder =\n" + + " clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {\n" + + " chatRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getChatRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());\n" + + " RetrySettings.Builder chatAgainRetrySettingBuilder =\n" + + " clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {\n" + + " chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getChatAgainRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder\n" + + " .chatAgainSettings()\n" + + " .setRetrySettings(chatAgainRetrySettingBuilder.build());\n" + + " RetrySettings.Builder pagedExpandRetrySettingBuilder =\n" + + " clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {\n" + + " pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getPagedExpandRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder\n" + + " .pagedExpandSettings()\n" + + " .setRetrySettings(pagedExpandRetrySettingBuilder.build());\n" + + " RetrySettings.Builder simplePagedExpandRetrySettingBuilder =\n" + + " clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {\n" + + " simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder\n" + + " .simplePagedExpandSettings()\n" + + " .setRetrySettings(simplePagedExpandRetrySettingBuilder.build());\n" + + " RetrySettings.Builder waitRetrySettingBuilder =\n" + + " clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {\n" + + " waitRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getWaitRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());\n" + + " RetrySettings.Builder blockRetrySettingBuilder =\n" + + " clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {\n" + + " blockRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getBlockRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());\n" + + " RetrySettings.Builder collideNameRetrySettingBuilder =\n" + + " clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {\n" + + " collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + + " this.clientProperties.getCollideNameRpcTimeoutMultiplier());\n" + + " }\n" + + " clientSettingsBuilder\n" + + " .collideNameSettings()\n" + + " .setRetrySettings(collideNameRetrySettingBuilder.build());\n" + " return EchoClient.create(clientSettingsBuilder.build());\n" + " }\n" + "}\n"; @@ -229,57 +307,57 @@ public void generatePropertiesTest() { + " private String quotaProjectId;\n" + " private Integer executorThreadCount;\n" + " private boolean useRest;\n" - // retry settings per method, with default - // (alternative not setting default here, but in autoconfig bean creation) - + " private Duration echoInitialRetryDelay = Duration.ofMillis(100L);\n" - + " private double echoRetryDelayMultiplier = 2.0;\n" - + " private Duration echoMaxRetryDelay = Duration.ofMillis(3000L);\n" - + " private Duration echoInitialRpcTimeout = Duration.ofMillis(10000L);\n" - + " private double echoRpcTimeoutMultiplier = 1.0;\n" - + " private Duration echoMaxRpcTimeout = Duration.ofMillis(10000L);\n" - + " private Duration echoTotalTimeout = Duration.ofMillis(10000L);\n" - + " private Duration expandInitialRetryDelay = Duration.ofMillis(100L);\n" - + " private double expandRetryDelayMultiplier = 2.0;\n" - + " private Duration expandMaxRetryDelay = Duration.ofMillis(3000L);\n" - + " private Duration expandInitialRpcTimeout = Duration.ofMillis(10000L);\n" - + " private double expandRpcTimeoutMultiplier = 1.0;\n" - + " private Duration expandMaxRpcTimeout = Duration.ofMillis(10000L);\n" - + " private Duration expandTotalTimeout = Duration.ofMillis(10000L);\n" - + " private Duration collectInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double collectRpcTimeoutMultiplier = 1.0;\n" - + " private Duration collectMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration collectTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration chatInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double chatRpcTimeoutMultiplier = 1.0;\n" - + " private Duration chatMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration chatTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration chatAgainInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double chatAgainRpcTimeoutMultiplier = 1.0;\n" - + " private Duration chatAgainMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration chatAgainTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration pagedExpandInitialRetryDelay = Duration.ofMillis(100L);\n" - + " private double pagedExpandRetryDelayMultiplier = 2.0;\n" - + " private Duration pagedExpandMaxRetryDelay = Duration.ofMillis(3000L);\n" - + " private Duration pagedExpandInitialRpcTimeout = Duration.ofMillis(10000L);\n" - + " private double pagedExpandRpcTimeoutMultiplier = 1.0;\n" - + " private Duration pagedExpandMaxRpcTimeout = Duration.ofMillis(10000L);\n" - + " private Duration pagedExpandTotalTimeout = Duration.ofMillis(10000L);\n" - + " private Duration simplePagedExpandInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double simplePagedExpandRpcTimeoutMultiplier = 1.0;\n" - + " private Duration simplePagedExpandMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration simplePagedExpandTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration waitInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double waitRpcTimeoutMultiplier = 1.0;\n" - + " private Duration waitMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration waitTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration blockInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double blockRpcTimeoutMultiplier = 1.0;\n" - + " private Duration blockMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration blockTotalTimeout = Duration.ofMillis(5000L);\n" - + " private Duration collideNameInitialRpcTimeout = Duration.ofMillis(5000L);\n" - + " private double collideNameRpcTimeoutMultiplier = 1.0;\n" - + " private Duration collideNameMaxRpcTimeout = Duration.ofMillis(5000L);\n" - + " private Duration collideNameTotalTimeout = Duration.ofMillis(5000L);\n" + // retry settings per method, no default set + // checks for null in autoconfig class when using + + " private Duration echoInitialRetryDelay;\n" + + " private Double echoRetryDelayMultiplier;\n" + + " private Duration echoMaxRetryDelay;\n" + + " private Duration echoInitialRpcTimeout;\n" + + " private Double echoRpcTimeoutMultiplier;\n" + + " private Duration echoMaxRpcTimeout;\n" + + " private Duration echoTotalTimeout;\n" + + " private Duration expandInitialRetryDelay;\n" + + " private Double expandRetryDelayMultiplier;\n" + + " private Duration expandMaxRetryDelay;\n" + + " private Duration expandInitialRpcTimeout;\n" + + " private Double expandRpcTimeoutMultiplier;\n" + + " private Duration expandMaxRpcTimeout;\n" + + " private Duration expandTotalTimeout;\n" + + " private Duration collectInitialRpcTimeout;\n" + + " private Double collectRpcTimeoutMultiplier;\n" + + " private Duration collectMaxRpcTimeout;\n" + + " private Duration collectTotalTimeout;\n" + + " private Duration chatInitialRpcTimeout;\n" + + " private Double chatRpcTimeoutMultiplier;\n" + + " private Duration chatMaxRpcTimeout;\n" + + " private Duration chatTotalTimeout;\n" + + " private Duration chatAgainInitialRpcTimeout;\n" + + " private Double chatAgainRpcTimeoutMultiplier;\n" + + " private Duration chatAgainMaxRpcTimeout;\n" + + " private Duration chatAgainTotalTimeout;\n" + + " private Duration pagedExpandInitialRetryDelay;\n" + + " private Double pagedExpandRetryDelayMultiplier;\n" + + " private Duration pagedExpandMaxRetryDelay;\n" + + " private Duration pagedExpandInitialRpcTimeout;\n" + + " private Double pagedExpandRpcTimeoutMultiplier;\n" + + " private Duration pagedExpandMaxRpcTimeout;\n" + + " private Duration pagedExpandTotalTimeout;\n" + + " private Duration simplePagedExpandInitialRpcTimeout;\n" + + " private Double simplePagedExpandRpcTimeoutMultiplier;\n" + + " private Duration simplePagedExpandMaxRpcTimeout;\n" + + " private Duration simplePagedExpandTotalTimeout;\n" + + " private Duration waitInitialRpcTimeout;\n" + + " private Double waitRpcTimeoutMultiplier;\n" + + " private Duration waitMaxRpcTimeout;\n" + + " private Duration waitTotalTimeout;\n" + + " private Duration blockInitialRpcTimeout;\n" + + " private Double blockRpcTimeoutMultiplier;\n" + + " private Duration blockMaxRpcTimeout;\n" + + " private Duration blockTotalTimeout;\n" + + " private Duration collideNameInitialRpcTimeout;\n" + + " private Double collideNameRpcTimeoutMultiplier;\n" + + " private Duration collideNameMaxRpcTimeout;\n" + + " private Duration collideNameTotalTimeout;\n" + "\n" + " @Override\n" + " public Credentials getCredentials() {\n" diff --git a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java index bc3525d8db..52c24d173d 100644 --- a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java @@ -115,6 +115,6 @@ public void spring_composer_test() { codeWriter.clear(); } - Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); + // Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); } } From 63ec5d3090c2fb2d3e192763990f22cfc7c41d7c Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 9 Sep 2022 17:40:24 +0000 Subject: [PATCH 033/103] minor change: move generated metadate and package.info under spring folder. --- .../java/com/google/api/generator/spring/SpringWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 1d6f65fe31..d773eadff4 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -113,7 +113,8 @@ private static String writePackageInfo( String code = codeWriter.write(); codeWriter.clear(); - String packagePath = "src/main/java/" + packageInfo.pakkage().replaceAll("\\.", "/"); + String packagePath = + "src/main/java/" + packageInfo.pakkage().replaceAll("\\.", "/") + "/spring"; JarEntry jarEntry = new JarEntry(String.format("%s/package-info.java", packagePath)); try { jos.putNextEntry(jarEntry); From 37be29ca654f4da2f9591bea4aecdbb43a0f7a8a Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 9 Sep 2022 20:13:43 +0000 Subject: [PATCH 034/103] back out unrelated change in RetrySettingsComposer. --- .../generator/gapic/composer/common/RetrySettingsComposer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java index 4298dd442c..e5e4ad4195 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java @@ -707,7 +707,6 @@ private static MethodInvocationExpr createDurationOfMillisExpr(ValueExpr valExpr .setStaticReferenceType(FIXED_TYPESTORE.get("Duration")) .setMethodName("ofMillis") .setArguments(valExpr) - .setReturnType(FIXED_TYPESTORE.get("Duration")) .build(); } From b0e2908b0ceed3837a27192fbe179350161e9fab Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 9 Sep 2022 21:34:23 +0000 Subject: [PATCH 035/103] fix: getter/setters double to Double. --- .../SpringPropertiesClassComposer.java | 3 ++ .../SpringAutoConfigClassComposerTest.java | 53 ++++++++++--------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 35f30a40a6..949e34c4de 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -216,6 +216,9 @@ private static List createGetterSetters( (List methodAndPropertyName, Expr defaultVal) -> { List getterAndSetter = new ArrayList<>(); TypeNode propertyType = defaultVal.type(); + if (propertyType.equals(TypeNode.DOUBLE)) { + propertyType = TypeNode.DOUBLE_OBJECT; + } String propertyName = Joiner.on("").join(methodAndPropertyName); getterAndSetter.add( createGetterMethod(thisClassType, propertyName, propertyType, null)); diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index d31a8e4b03..5bbcf5d805 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -126,6 +126,7 @@ public void generatePropertiesTest() { JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); + System.out.println(visitor.write()); assertEquals(EXPECTED_PROPERTY_CLASS_STRING, visitor.write()); } @@ -393,11 +394,11 @@ public void generatePropertiesTest() { + " this.echoInitialRetryDelay = echoInitialRetryDelay;\n" + " }\n" + "\n" - + " public double getEchoRetryDelayMultiplier() {\n" + + " public Double getEchoRetryDelayMultiplier() {\n" + " return this.echoRetryDelayMultiplier;\n" + " }\n" + "\n" - + " public void setEchoRetryDelayMultiplier(double echoRetryDelayMultiplier) {\n" + + " public void setEchoRetryDelayMultiplier(Double echoRetryDelayMultiplier) {\n" + " this.echoRetryDelayMultiplier = echoRetryDelayMultiplier;\n" + " }\n" + "\n" @@ -417,11 +418,11 @@ public void generatePropertiesTest() { + " this.echoInitialRpcTimeout = echoInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getEchoRpcTimeoutMultiplier() {\n" + + " public Double getEchoRpcTimeoutMultiplier() {\n" + " return this.echoRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setEchoRpcTimeoutMultiplier(double echoRpcTimeoutMultiplier) {\n" + + " public void setEchoRpcTimeoutMultiplier(Double echoRpcTimeoutMultiplier) {\n" + " this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -449,11 +450,11 @@ public void generatePropertiesTest() { + " this.expandInitialRetryDelay = expandInitialRetryDelay;\n" + " }\n" + "\n" - + " public double getExpandRetryDelayMultiplier() {\n" + + " public Double getExpandRetryDelayMultiplier() {\n" + " return this.expandRetryDelayMultiplier;\n" + " }\n" + "\n" - + " public void setExpandRetryDelayMultiplier(double expandRetryDelayMultiplier) {\n" + + " public void setExpandRetryDelayMultiplier(Double expandRetryDelayMultiplier) {\n" + " this.expandRetryDelayMultiplier = expandRetryDelayMultiplier;\n" + " }\n" + "\n" @@ -473,11 +474,11 @@ public void generatePropertiesTest() { + " this.expandInitialRpcTimeout = expandInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getExpandRpcTimeoutMultiplier() {\n" + + " public Double getExpandRpcTimeoutMultiplier() {\n" + " return this.expandRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setExpandRpcTimeoutMultiplier(double expandRpcTimeoutMultiplier) {\n" + + " public void setExpandRpcTimeoutMultiplier(Double expandRpcTimeoutMultiplier) {\n" + " this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -505,11 +506,11 @@ public void generatePropertiesTest() { + " this.collectInitialRpcTimeout = collectInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getCollectRpcTimeoutMultiplier() {\n" + + " public Double getCollectRpcTimeoutMultiplier() {\n" + " return this.collectRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setCollectRpcTimeoutMultiplier(double collectRpcTimeoutMultiplier) {\n" + + " public void setCollectRpcTimeoutMultiplier(Double collectRpcTimeoutMultiplier) {\n" + " this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -537,11 +538,11 @@ public void generatePropertiesTest() { + " this.chatInitialRpcTimeout = chatInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getChatRpcTimeoutMultiplier() {\n" + + " public Double getChatRpcTimeoutMultiplier() {\n" + " return this.chatRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setChatRpcTimeoutMultiplier(double chatRpcTimeoutMultiplier) {\n" + + " public void setChatRpcTimeoutMultiplier(Double chatRpcTimeoutMultiplier) {\n" + " this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -569,11 +570,11 @@ public void generatePropertiesTest() { + " this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getChatAgainRpcTimeoutMultiplier() {\n" + + " public Double getChatAgainRpcTimeoutMultiplier() {\n" + " return this.chatAgainRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setChatAgainRpcTimeoutMultiplier(double chatAgainRpcTimeoutMultiplier) {\n" + + " public void setChatAgainRpcTimeoutMultiplier(Double chatAgainRpcTimeoutMultiplier) {\n" + " this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -601,11 +602,11 @@ public void generatePropertiesTest() { + " this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay;\n" + " }\n" + "\n" - + " public double getPagedExpandRetryDelayMultiplier() {\n" + + " public Double getPagedExpandRetryDelayMultiplier() {\n" + " return this.pagedExpandRetryDelayMultiplier;\n" + " }\n" + "\n" - + " public void setPagedExpandRetryDelayMultiplier(double pagedExpandRetryDelayMultiplier) {\n" + + " public void setPagedExpandRetryDelayMultiplier(Double pagedExpandRetryDelayMultiplier) {\n" + " this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier;\n" + " }\n" + "\n" @@ -625,11 +626,11 @@ public void generatePropertiesTest() { + " this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getPagedExpandRpcTimeoutMultiplier() {\n" + + " public Double getPagedExpandRpcTimeoutMultiplier() {\n" + " return this.pagedExpandRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setPagedExpandRpcTimeoutMultiplier(double pagedExpandRpcTimeoutMultiplier) {\n" + + " public void setPagedExpandRpcTimeoutMultiplier(Double pagedExpandRpcTimeoutMultiplier) {\n" + " this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -657,12 +658,12 @@ public void generatePropertiesTest() { + " this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getSimplePagedExpandRpcTimeoutMultiplier() {\n" + + " public Double getSimplePagedExpandRpcTimeoutMultiplier() {\n" + " return this.simplePagedExpandRpcTimeoutMultiplier;\n" + " }\n" + "\n" + " public void setSimplePagedExpandRpcTimeoutMultiplier(\n" - + " double simplePagedExpandRpcTimeoutMultiplier) {\n" + + " Double simplePagedExpandRpcTimeoutMultiplier) {\n" + " this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -690,11 +691,11 @@ public void generatePropertiesTest() { + " this.waitInitialRpcTimeout = waitInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getWaitRpcTimeoutMultiplier() {\n" + + " public Double getWaitRpcTimeoutMultiplier() {\n" + " return this.waitRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setWaitRpcTimeoutMultiplier(double waitRpcTimeoutMultiplier) {\n" + + " public void setWaitRpcTimeoutMultiplier(Double waitRpcTimeoutMultiplier) {\n" + " this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -722,11 +723,11 @@ public void generatePropertiesTest() { + " this.blockInitialRpcTimeout = blockInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getBlockRpcTimeoutMultiplier() {\n" + + " public Double getBlockRpcTimeoutMultiplier() {\n" + " return this.blockRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setBlockRpcTimeoutMultiplier(double blockRpcTimeoutMultiplier) {\n" + + " public void setBlockRpcTimeoutMultiplier(Double blockRpcTimeoutMultiplier) {\n" + " this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier;\n" + " }\n" + "\n" @@ -754,11 +755,11 @@ public void generatePropertiesTest() { + " this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout;\n" + " }\n" + "\n" - + " public double getCollideNameRpcTimeoutMultiplier() {\n" + + " public Double getCollideNameRpcTimeoutMultiplier() {\n" + " return this.collideNameRpcTimeoutMultiplier;\n" + " }\n" + "\n" - + " public void setCollideNameRpcTimeoutMultiplier(double collideNameRpcTimeoutMultiplier) {\n" + + " public void setCollideNameRpcTimeoutMultiplier(Double collideNameRpcTimeoutMultiplier) {\n" + " this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier;\n" + " }\n" + "\n" From ada6e9291f37e0af9f0eda27b1b020976417806f Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 3 Oct 2022 13:00:47 -0400 Subject: [PATCH 036/103] fix(Spring CodeGen): switch to Spring boot 2.7 style in registering auto-configurations (#1044) Spring Boot 2.7 has introduced [changes to how auto-configurations](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#changes-to-auto-configuration) are registered. Both changes are backward compatible, but the older `spring.factories` style [will be removed in Spring Boot 3.0](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0.0-M5-Release-Notes#auto-configuration-registration). Also consider that Spring Boot 2.6.x goes out of support by 11-24-2022, switching this code to 2.7's new style. --- .../google/api/generator/spring/SpringWriter.java | 15 ++++++++------- .../composer/SpringAutoConfigClassComposer.java | 15 ++++++--------- .../spring/SpringAutoConfigClassComposerTest.java | 4 ++-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index d773eadff4..3df77aa1dd 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -60,7 +60,7 @@ public static CodeGeneratorResponse write( } // write spring.factories file - writeSpringFactories(context, jos); + writeAutoConfigRegistration(context, jos); writeSpringAdditionalMetadataJson(context, jos); // TODO: metadata and package info not custimized for Spring @@ -138,14 +138,15 @@ private static void writeMetadataFile(GapicContext context, String path, JarOutp } } - private static void writeSpringFactories(GapicContext context, JarOutputStream jos) { - String path = "src/main/resources/META-INF"; - JarEntry jarEntry = new JarEntry(String.format("%s/spring.factories", path)); + private static void writeAutoConfigRegistration(GapicContext context, JarOutputStream jos) { + String path = "src/main/resources/META-INF/spring"; + JarEntry jarEntry = + new JarEntry( + String.format( + "%s/org.springframework.boot.autoconfigure.AutoConfiguration.imports", path)); try { jos.putNextEntry(jarEntry); - StringJoiner sb = - new StringJoiner( - ",\\\n", "org.springframework.boot.autoconfigure.EnableAutoConfiguration=\\\n", ""); + StringJoiner sb = new StringJoiner("\n", "", ""); context .services() .forEach( diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index fe33bbdfb9..aba9ec3c97 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -396,7 +396,7 @@ private static MethodDefinition createConstructor( private static List createClassAnnotations( Service service, Map types, String libName) { // @Generated("by gapic-generator-java") - // @Configuration(proxyBeanMethods = false) + // @AutoConfiguration // @ConditionalOnClass(LanguageServiceClient.class) // @ConditionalOnProperty(value = "spring.cloud.gcp.language.enabled", matchIfMissing = true) // @EnableConfigurationProperties(LanguageProperties.class) @@ -421,10 +421,7 @@ private static List createClassAnnotations( // XXX.class .build(); AnnotationNode configurationNode = - AnnotationNode.builder() - .setType(types.get("Configuration")) - .setDescription("proxyBeanMethods = false") // TODO: change to parameters - .build(); + AnnotationNode.builder().setType(types.get("AutoConfiguration")).build(); AnnotationNode enableConfigurationPropertiesNode = AnnotationNode.builder() .setType(types.get("EnableConfigurationProperties")) @@ -1020,11 +1017,11 @@ private static Map createDynamicTypes(Service service, String .setName("Bean") .setPakkage("org.springframework.context.annotation") .build()); - TypeNode configuration = + TypeNode autoConfiguration = TypeNode.withReference( VaporReference.builder() - .setName("Configuration") - .setPakkage("org.springframework.context.annotation") + .setName("AutoConfiguration") + .setPakkage("org.springframework.boot.autoconfigure") .build()); TypeNode enableConfigurationProperties = TypeNode.withReference( @@ -1062,7 +1059,7 @@ private static Map createDynamicTypes(Service service, String typeMap.put("ServiceSettings", serviceSettings); typeMap.put("ServiceSettingsBuilder", serviceSettingsBuilder); typeMap.put("Bean", bean); - typeMap.put("Configuration", configuration); + typeMap.put("AutoConfiguration", autoConfiguration); typeMap.put("EnableConfigurationProperties", enableConfigurationProperties); typeMap.put("ConditionalOnMissingBean", conditionalOnMissingBean); typeMap.put("ConditionalOnProperty", conditionalOnProperty); diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 5bbcf5d805..8fef5ea0a5 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -144,15 +144,15 @@ public void generatePropertiesTest() { + "import com.google.showcase.v1beta1.EchoSettings;\n" + "import java.io.IOException;\n" + "import javax.annotation.Generated;\n" + + "import org.springframework.boot.autoconfigure.AutoConfiguration;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + "import org.springframework.boot.context.properties.EnableConfigurationProperties;\n" + "import org.springframework.context.annotation.Bean;\n" - + "import org.springframework.context.annotation.Configuration;\n" + "\n" + "@Generated(\"by gapic-generator-java\")\n" - + "@Configuration(\"proxyBeanMethods = false\")\n" + + "@AutoConfiguration\n" + "@ConditionalOnClass(\"value = EchoClient.class\")\n" + "@ConditionalOnProperty(\n" + " \"value = \\\"spring.cloud.gcp.autoconfig.showcase.echo.enabled\\\", matchIfMissing = false\")\n" From 3cd3419c1a07519321f1ed301eb0e157f6b88f08 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 4 Oct 2022 12:41:53 -0400 Subject: [PATCH 037/103] fix: Cleanups on code (#1054) Some small cleanups on code: - remove SpringAutoConfigClassComposer code for RETRY_PARAM_DEFINITIONS, which is not used. - remove unused parameter in SpringWriter - fix test setup differences in SpringComposerTest and the two test in SpringAutoConfigClassComposerTest. --- .../api/generator/spring/SpringGenerator.java | 2 +- .../api/generator/spring/SpringWriter.java | 6 +- .../SpringAutoConfigClassComposer.java | 195 +---------------- .../spring/composer/SpringComposer.java | 7 +- .../SpringAutoConfigClassComposerTest.java | 205 ++++++++++++++---- .../generator/spring/SpringComposerTest.java | 23 +- 6 files changed, 185 insertions(+), 253 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringGenerator.java b/src/main/java/com/google/api/generator/spring/SpringGenerator.java index e2a2cac31c..3df06aa5e2 100644 --- a/src/main/java/com/google/api/generator/spring/SpringGenerator.java +++ b/src/main/java/com/google/api/generator/spring/SpringGenerator.java @@ -30,6 +30,6 @@ public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); GapicPackageInfo packageInfo = Composer.composePackageInfo(context); String outputFilename = "temp-codegen-spring.srcjar"; - return SpringWriter.write(context, clazzes, packageInfo, outputFilename, true); + return SpringWriter.write(context, clazzes, packageInfo, outputFilename); } } diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 3df77aa1dd..7bf3ef1613 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -43,8 +43,7 @@ public static CodeGeneratorResponse write( GapicContext context, List clazzes, GapicPackageInfo gapicPackageInfo, - String outputFilePath, - boolean isSpringContent) { + String outputFilePath) { ByteString.Output output = ByteString.newOutput(); JavaWriterVisitor codeWriter = new JavaWriterVisitor(); JarOutputStream jos; @@ -55,8 +54,7 @@ public static CodeGeneratorResponse write( } for (GapicClass gapicClazz : clazzes) { - String classPath = writeClazz(gapicClazz, codeWriter, jos); - // writeSamples(gapicClazz, getSamplePackage(gapicClazz), classPath, jos); + writeClazz(gapicClazz, codeWriter, jos); } // write spring.factories file diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index aba9ec3c97..1e7c871b22 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -20,11 +20,8 @@ import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; -import com.google.api.generator.engine.ast.BlockComment; -import com.google.api.generator.engine.ast.BlockStatement; import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; -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.ExprStatement; @@ -42,7 +39,6 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.common.ClassComposer; -import com.google.api.generator.gapic.composer.common.RetrySettingsComposer; import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; @@ -91,13 +87,8 @@ public GapicClass generate(GapicContext context, Service service) { types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); - // header -- not used, add later - List fileHeader = - Arrays.asList(CommentStatement.withComment(BlockComment.withComment("Apache License"))); - ClassDefinition classDef = ClassDefinition.builder() - // .setFileHeader(fileHeader) .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) @@ -135,22 +126,6 @@ private static List createMemberVariables( GapicServiceConfig serviceConfig) { String serviceName = service.name(); - // TODO create CredentialsProvider bean instead. - // // private final CredentialsProvider credentialsProvider; - // Variable credentialsProviderVar = - // Variable.builder() - // .setName("credentialsProvider") - // .setType(types.get("CredentialsProvider")) - // .build(); - // VariableExpr credentialsProviderVarExpr = - // VariableExpr.builder() - // .setVariable(credentialsProviderVar) - // .setScope(ScopeNode.PRIVATE) - // .setIsFinal(true) - // .setIsDecl(true) - // .build(); - // ExprStatement credentialsProviderVarStatement = - // ExprStatement.withExpr(credentialsProviderVarExpr); // private final LanguageProperties clientProperties; Variable clientPropertiesVar = @@ -167,37 +142,7 @@ private static List createMemberVariables( .build(); ExprStatement clientPropertiesStatement = ExprStatement.withExpr(clientPropertiesVarExpr); - // // private final GcpProjectIdProvider projectIdProvider; - // Variable projectIdProviderVar = - // Variable.builder() - // .setName("projectIdProvider") - // .setType(types.get("GcpProjectIdProvider")) - // .build(); - // VariableExpr projectIdProviderVarExpr = - // VariableExpr.builder() - // .setVariable(projectIdProviderVar) - // .setScope(ScopeNode.PRIVATE) - // .setIsFinal(true) - // .setIsDecl(true) - // .build(); - // ExprStatement projectIdProviderStatement = ExprStatement.withExpr(projectIdProviderVarExpr); - - // Declare the RETRY_PARAM_DEFINITIONS map. - ExprStatement retryPramStatement = - ExprStatement.withExpr( - NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR - .toBuilder() - .setIsDecl(true) - .setScope(ScopeNode.PRIVATE) - .setIsStatic(true) - .setIsFinal(true) - .build()); - - BlockStatement retryParamDefinitionsBlock = - RetrySettingsComposer.createRetryParamDefinitionsBlock( - service, serviceConfig, NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR); - - return Arrays.asList(clientPropertiesStatement, retryPramStatement, retryParamDefinitionsBlock); + return Arrays.asList(clientPropertiesStatement); } private static MethodDefinition createConstructor( @@ -249,147 +194,11 @@ private static MethodDefinition createConstructor( ExprStatement thisPropertiesAssignmentStatement = ExprStatement.withExpr(thisPropertiesAssignmentExpr); - // /** - // * if (properties.getCredentials().hasKey()) { this.credentialsProvider = new - // * DefaultCredentialsProvider(properties); } else { this.credentialsProvider = - // * coreCredentialsProvider; } - // */ - // - // // expr: properties.getCredentials().hasKey() - // - // MethodInvocationExpr getCredentialsExpr = - // MethodInvocationExpr.builder() - // .setMethodName("getCredentials") - // .setExprReferenceExpr(propertiesVarExpr) - // .setReturnType(types.get("Credentials")) - // .build(); - // MethodInvocationExpr hasKeyExpr = - // MethodInvocationExpr.builder() - // .setMethodName("hasKey") - // .setExprReferenceExpr(getCredentialsExpr) - // .setReturnType(TypeNode.BOOLEAN) - // .build(); - // - // // if body: this.credentialsProvider = new DefaultCredentialsProvider(properties) - // CastExpr castExpr = - // CastExpr.builder() - // .setExpr( - // NewObjectExpr.builder() - // .setType(types.get("DefaultCredentialsProvider")) - // .setArguments(propertiesVarExpr) - // .build()) - // .setType(types.get("CredentialsProvider")) - // .build(); - // Variable credentialsProviderVar = - // Variable.builder() - // .setName("credentialsProvider") - // .setType(types.get("CredentialsProvider")) - // .build(); - // AssignmentExpr credentialsProviderssignExpr = - // AssignmentExpr.builder() - // .setVariableExpr( - // VariableExpr.withVariable(credentialsProviderVar) - // .toBuilder() - // .setExprReferenceExpr(thisExpr) - // .build()) - // .setValueExpr(castExpr) - // .build(); - // - // // else body: this.credentialsProvider = coreCredentialsProvider; - // List coreCredentialsProviderAssignmentExprs = new ArrayList<>(); - // coreCredentialsProviderAssignmentExprs.add( - // AssignmentExpr.builder() - // .setVariableExpr( - // VariableExpr.withVariable(credentialsProviderVar) - // .toBuilder() - // .setExprReferenceExpr(thisExpr) - // .build()) - // .setValueExpr( - // CastExpr.builder() - // .setExpr(coreProjectIdProviderVarExpr) - // .setType(types.get("CredentialsProvider")) - // .build()) - // .build()); - // - // IfStatement credentialIfStatement = - // IfStatement.builder() - // .setConditionExpr(hasKeyExpr) - // .setBody(Arrays.asList(ExprStatement.withExpr(credentialsProviderssignExpr))) - // .setElseBody( - // coreCredentialsProviderAssignmentExprs.stream() - // .map(e -> ExprStatement.withExpr(e)) - // .collect(Collectors.toList())) - // .build(); - // - // /** - // * if (clientProperties.getProjectId() != null) { this.projectIdProvider = - // * clientProperties::getProjectId; } else { this.projectIdProvider = coreProjectIdProvider; } - // */ - // // else body: this.projectIdProvider = coreProjectIdProvider; - // List ctorAssignmentExprs = new ArrayList<>(); - // ctorAssignmentExprs.add( - // AssignmentExpr.builder() - // .setVariableExpr( - // VariableExpr.withVariable(projectIdProviderVar) - // .toBuilder() - // .setExprReferenceExpr(thisExpr) - // .build()) - // .setValueExpr(coreProjectIdProviderVarExpr) - // .build()); - // - // // expr: clientProperties.getProjectId() != null - // MethodInvocationExpr getProjectIdExpr = - // MethodInvocationExpr.builder() - // .setMethodName("getProjectId") - // .setExprReferenceExpr( - // VariableExpr.withVariable(clientPropertiesVar).toBuilder().build()) - // // .setStaticReferenceType(clientType) - // .setReturnType(types.get("CredentialsProvider")) // fake it - // .build(); - // RelationalOperationExpr notEqualSentence = - // RelationalOperationExpr.notEqualToWithExprs(getProjectIdExpr, - // ValueExpr.createNullExpr()); - // - // // () -> clientProperties.getProjectId(); - // LambdaExpr lambdaExpr = LambdaExpr.builder().setReturnExpr(getProjectIdExpr).build(); - // - // // this.projectIdProvider = () -> clientProperties.getProjectId(); - // AssignmentExpr projectIdProviderAssignExpr = - // AssignmentExpr.builder() - // .setVariableExpr( - // VariableExpr.withVariable(projectIdProviderVar) - // .toBuilder() - // .setExprReferenceExpr(thisExpr) - // .build()) - // .setValueExpr( - // CastExpr.builder() - // .setExpr(lambdaExpr) - // .setType(types.get("GcpProjectIdProvider")) - // .build()) - // .build(); - // - // IfStatement projectIdProviderIfStatement = - // IfStatement.builder() - // .setConditionExpr(notEqualSentence) - // .setBody(Arrays.asList(ExprStatement.withExpr(projectIdProviderAssignExpr))) - // .setElseBody( - // ctorAssignmentExprs.stream() - // .map(e -> ExprStatement.withExpr(e)) - // .collect(Collectors.toList())) - // .build(); - return MethodDefinition.constructorBuilder() .setScope(ScopeNode.PROTECTED) .setReturnType(types.get(className)) - .setArguments( - Arrays.asList( - // credentialsProviderBuilderVarExpr.toBuilder().setIsDecl(true).build(), - // coreProjectIdProviderVarExpr.toBuilder().setIsDecl(true).build(), - propertiesVarExpr.toBuilder().setIsDecl(true).build())) + .setArguments(Arrays.asList(propertiesVarExpr.toBuilder().setIsDecl(true).build())) .setBody(Arrays.asList(thisPropertiesAssignmentStatement)) - // credentialIfStatement, - // projectIdProviderIfStatement)) - // .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class))) .build(); } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index d05eda85ca..2a039224bf 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -26,12 +26,11 @@ public class SpringComposer { public static List composeServiceAutoConfigClasses(GapicContext context) { List clazzes = new ArrayList<>(); - clazzes.addAll(generateClientAutoConfig(context)); - // TODO: from context, explore if any property settings needed. + clazzes.addAll(generatePerServiceClasses(context)); return addApacheLicense(clazzes); } - protected static List generateClientAutoConfig(GapicContext context) { + protected static List generatePerServiceClasses(GapicContext context) { List clazzes = new ArrayList<>(); context .services() @@ -40,7 +39,7 @@ protected static List generateClientAutoConfig(GapicContext context) if (context.transport() == Transport.GRPC || context.transport() == Transport.GRPC_REST) { clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s)); - // clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s)); + clazzes.add(SpringPropertiesClassComposer.instance().generate(context, s)); } }); return clazzes; diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 8fef5ea0a5..70505f6761 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -46,19 +46,16 @@ public class SpringAutoConfigClassComposerTest { private ServiceDescriptor echoService; private FileDescriptor echoFileDescriptor; + private GapicContext context; + private Service echoProtoService; @Before public void setUp() { echoFileDescriptor = EchoOuterClass.getDescriptor(); - ServiceDescriptor serviceDescriptor = echoFileDescriptor.getServices().get(0); - // Assert.assertEquals(serviceDescriptor.getName(), "Bookshop"); echoService = echoFileDescriptor.getServices().get(0); assertEquals(echoService.getName(), "Echo"); - } - @Test - public void generateAutoConfigClasses() { Map messageTypes = Parser.parseMessages(echoFileDescriptor); Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); @@ -68,13 +65,13 @@ public void generateAutoConfigClasses() { Parser.parseService( echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); - String jsonFilename = "retrying_grpc_service_config.json"; + String jsonFilename = "showcase_grpc_service_config.json"; Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); assertTrue(serviceConfigOpt.isPresent()); GapicServiceConfig serviceConfig = serviceConfigOpt.get(); - GapicContext context = + this.context = GapicContext.builder() .setMessages(messageTypes) .setResourceNames(resourceNames) @@ -84,8 +81,13 @@ public void generateAutoConfigClasses() { .setServiceConfig(serviceConfig) .build(); - Service echoProtoService = services.get(0); - GapicClass clazz = SpringAutoConfigClassComposer.instance().generate(context, echoProtoService); + this.echoProtoService = services.get(0); + } + + @Test + public void generateAutoConfigClazzTest() { + GapicClass clazz = + SpringAutoConfigClassComposer.instance().generate(this.context, this.echoProtoService); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -93,36 +95,10 @@ public void generateAutoConfigClasses() { } @Test - public void generatePropertiesTest() { - - Map messageTypes = Parser.parseMessages(echoFileDescriptor); + public void generatePropertiesClazzTest() { - Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); - Set outputResourceNames = new HashSet<>(); - - List services = - Parser.parseService( - echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); - - String jsonFilename = "showcase_grpc_service_config.json"; - Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); - Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); - assertTrue(serviceConfigOpt.isPresent()); - GapicServiceConfig serviceConfig = serviceConfigOpt.get(); - - GapicContext context = - GapicContext.builder() - .setMessages(messageTypes) - .setResourceNames(resourceNames) - .setServices(services) - .setHelperResourceNames(outputResourceNames) - .setTransport(Transport.GRPC) - .setServiceConfig(serviceConfig) - .build(); - - Service echoProtoService = services.get(0); - - GapicClass clazz = SpringPropertiesClassComposer.instance().generate(context, echoProtoService); + GapicClass clazz = + SpringPropertiesClassComposer.instance().generate(this.context, this.echoProtoService); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -139,7 +115,6 @@ public void generatePropertiesTest() { + "import com.google.api.gax.retrying.RetrySettings;\n" + "import com.google.api.gax.rpc.TransportChannelProvider;\n" + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" - + "import com.google.common.collect.ImmutableMap;\n" + "import com.google.showcase.v1beta1.EchoClient;\n" + "import com.google.showcase.v1beta1.EchoSettings;\n" + "import java.io.IOException;\n" @@ -150,6 +125,7 @@ public void generatePropertiesTest() { + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" + "import org.springframework.boot.context.properties.EnableConfigurationProperties;\n" + "import org.springframework.context.annotation.Bean;\n" + + "import org.threeten.bp.Duration;\n" + "\n" + "@Generated(\"by gapic-generator-java\")\n" + "@AutoConfiguration\n" @@ -159,15 +135,6 @@ public void generatePropertiesTest() { + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + "public class EchoSpringAutoConfiguration {\n" + " private final EchoSpringProperties clientProperties;\n" - + " private static final ImmutableMap RETRY_PARAM_DEFINITIONS;\n" - + "\n" - + " static {\n" - + " ImmutableMap.Builder definitions = ImmutableMap.builder();\n" - + " RetrySettings settings = null;\n" - + " settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();\n" - + " definitions.put(\"no_retry_params\", settings);\n" - + " RETRY_PARAM_DEFINITIONS = definitions.build();\n" - + " }\n" + "\n" + " protected EchoSpringAutoConfiguration(" + "EchoSpringProperties clientProperties) {\n" @@ -213,79 +180,221 @@ public void generatePropertiesTest() { + " }\n" + " RetrySettings.Builder echoRetrySettingBuilder =\n" + " clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getEchoInitialRetryDelay() != null) {\n" + + " echoRetrySettingBuilder.setInitialRetryDelay(\n" + + " this.clientProperties.getEchoInitialRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {\n" + + " echoRetrySettingBuilder.setRetryDelayMultiplier(\n" + + " this.clientProperties.getEchoRetryDelayMultiplier());\n" + + " }\n" + + " if (this.clientProperties.getEchoMaxRetryDelay() != null) {\n" + + " echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getEchoInitialRpcTimeout() != null) {\n" + + " echoRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getEchoInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {\n" + " echoRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getEchoRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getEchoMaxRpcTimeout() != null) {\n" + + " echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getEchoTotalTimeout() != null) {\n" + + " echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());\n" + " RetrySettings.Builder expandRetrySettingBuilder =\n" + " clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getExpandInitialRetryDelay() != null) {\n" + + " expandRetrySettingBuilder.setInitialRetryDelay(\n" + + " this.clientProperties.getExpandInitialRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {\n" + + " expandRetrySettingBuilder.setRetryDelayMultiplier(\n" + + " this.clientProperties.getExpandRetryDelayMultiplier());\n" + + " }\n" + + " if (this.clientProperties.getExpandMaxRetryDelay() != null) {\n" + + " expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getExpandInitialRpcTimeout() != null) {\n" + + " expandRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getExpandInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {\n" + " expandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getExpandRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getExpandMaxRpcTimeout() != null) {\n" + + " expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getExpandTotalTimeout() != null) {\n" + + " expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());\n" + " RetrySettings.Builder collectRetrySettingBuilder =\n" + " clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getCollectInitialRpcTimeout() != null) {\n" + + " collectRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getCollectInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {\n" + " collectRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getCollectRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getCollectMaxRpcTimeout() != null) {\n" + + " collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getCollectTotalTimeout() != null) {\n" + + " collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());\n" + " RetrySettings.Builder chatRetrySettingBuilder =\n" + " clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getChatInitialRpcTimeout() != null) {\n" + + " chatRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getChatInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {\n" + " chatRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getChatRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getChatMaxRpcTimeout() != null) {\n" + + " chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getChatTotalTimeout() != null) {\n" + + " chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());\n" + " RetrySettings.Builder chatAgainRetrySettingBuilder =\n" + " clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {\n" + + " chatAgainRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getChatAgainInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {\n" + " chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getChatAgainRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {\n" + + " chatAgainRetrySettingBuilder.setMaxRpcTimeout(\n" + + " this.clientProperties.getChatAgainMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getChatAgainTotalTimeout() != null) {\n" + + " chatAgainRetrySettingBuilder.setTotalTimeout(\n" + + " this.clientProperties.getChatAgainTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder\n" + " .chatAgainSettings()\n" + " .setRetrySettings(chatAgainRetrySettingBuilder.build());\n" + " RetrySettings.Builder pagedExpandRetrySettingBuilder =\n" + " clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {\n" + + " pagedExpandRetrySettingBuilder.setInitialRetryDelay(\n" + + " this.clientProperties.getPagedExpandInitialRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {\n" + + " pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(\n" + + " this.clientProperties.getPagedExpandRetryDelayMultiplier());\n" + + " }\n" + + " if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {\n" + + " pagedExpandRetrySettingBuilder.setMaxRetryDelay(\n" + + " this.clientProperties.getPagedExpandMaxRetryDelay());\n" + + " }\n" + + " if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {\n" + + " pagedExpandRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getPagedExpandInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {\n" + " pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getPagedExpandRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {\n" + + " pagedExpandRetrySettingBuilder.setMaxRpcTimeout(\n" + + " this.clientProperties.getPagedExpandMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getPagedExpandTotalTimeout() != null) {\n" + + " pagedExpandRetrySettingBuilder.setTotalTimeout(\n" + + " this.clientProperties.getPagedExpandTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder\n" + " .pagedExpandSettings()\n" + " .setRetrySettings(pagedExpandRetrySettingBuilder.build());\n" + " RetrySettings.Builder simplePagedExpandRetrySettingBuilder =\n" + " clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {\n" + + " simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getSimplePagedExpandInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {\n" + " simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {\n" + + " simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(\n" + + " this.clientProperties.getSimplePagedExpandMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {\n" + + " simplePagedExpandRetrySettingBuilder.setTotalTimeout(\n" + + " this.clientProperties.getSimplePagedExpandTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder\n" + " .simplePagedExpandSettings()\n" + " .setRetrySettings(simplePagedExpandRetrySettingBuilder.build());\n" + " RetrySettings.Builder waitRetrySettingBuilder =\n" + " clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getWaitInitialRpcTimeout() != null) {\n" + + " waitRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getWaitInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {\n" + " waitRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getWaitRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getWaitMaxRpcTimeout() != null) {\n" + + " waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getWaitTotalTimeout() != null) {\n" + + " waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());\n" + " RetrySettings.Builder blockRetrySettingBuilder =\n" + " clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getBlockInitialRpcTimeout() != null) {\n" + + " blockRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getBlockInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {\n" + " blockRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getBlockRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getBlockMaxRpcTimeout() != null) {\n" + + " blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getBlockTotalTimeout() != null) {\n" + + " blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());\n" + " RetrySettings.Builder collideNameRetrySettingBuilder =\n" + " clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder();\n" + + " if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {\n" + + " collideNameRetrySettingBuilder.setInitialRpcTimeout(\n" + + " this.clientProperties.getCollideNameInitialRpcTimeout());\n" + + " }\n" + " if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {\n" + " collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(\n" + " this.clientProperties.getCollideNameRpcTimeoutMultiplier());\n" + " }\n" + + " if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {\n" + + " collideNameRetrySettingBuilder.setMaxRpcTimeout(\n" + + " this.clientProperties.getCollideNameMaxRpcTimeout());\n" + + " }\n" + + " if (this.clientProperties.getCollideNameTotalTimeout() != null) {\n" + + " collideNameRetrySettingBuilder.setTotalTimeout(\n" + + " this.clientProperties.getCollideNameTotalTimeout());\n" + + " }\n" + " clientSettingsBuilder\n" + " .collideNameSettings()\n" + " .setRetrySettings(collideNameRetrySettingBuilder.build());\n" diff --git a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java index 52c24d173d..eabbd62af9 100644 --- a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java @@ -63,7 +63,24 @@ public class SpringComposerTest { + " * limitations under the License.\n" + " */\n" + "\n" - + SpringAutoConfigClassComposerTest.EXPECTED_AUTOCONFIG_CLASS_STRING; + + SpringAutoConfigClassComposerTest.EXPECTED_AUTOCONFIG_CLASS_STRING + + "/*\n" + + " * Copyright 2022 Google LLC\n" + + " *\n" + + " * Licensed under the Apache License, Version 2.0 (the \"License\");\n" + + " * you may not use this file except in compliance with the License.\n" + + " * You may obtain a copy of the License at\n" + + " *\n" + + " * https://www.apache.org/licenses/LICENSE-2.0\n" + + " *\n" + + " * Unless required by applicable law or agreed to in writing, software\n" + + " * distributed under the License is distributed on an \"AS IS\" BASIS,\n" + + " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" + + " * See the License for the specific language governing permissions and\n" + + " * limitations under the License.\n" + + " */\n" + + "\n" + + SpringAutoConfigClassComposerTest.EXPECTED_PROPERTY_CLASS_STRING; @Before public void setUp() { @@ -81,7 +98,7 @@ public void setUp() { Parser.parseService( echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); - String jsonFilename = "retrying_grpc_service_config.json"; + String jsonFilename = "showcase_grpc_service_config.json"; Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); assertTrue(serviceConfigOpt.isPresent()); @@ -115,6 +132,6 @@ public void spring_composer_test() { codeWriter.clear(); } - // Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); + Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); } } From 9f44215d7fee4736848552a75b52237d351ea1d7 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Tue, 4 Oct 2022 15:25:36 -0400 Subject: [PATCH 038/103] fix(Spring CodeGen): Update missing and placeholder annotations (#1045) * Updates annotation parameter placeholder strings in SpringAutoConfigClassComposer for parameters of type class * Updates annotation parameter placeholder strings in SpringAutoConfigClassComposer for multiple parameters * Adds @Qualifier annotations on variables * Adds @NestedConfigurationProperty annotation on credentials field in SpringPropertiesClassComposer --- .../SpringAutoConfigClassComposer.java | 93 ++++++++++++++++--- .../SpringPropertiesClassComposer.java | 27 ++++-- .../SpringAutoConfigClassComposerTest.java | 14 ++- 3 files changed, 108 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 1e7c871b22..016ac0fb4a 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -29,9 +29,11 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; +import com.google.api.generator.engine.ast.StringObjectValue; import com.google.api.generator.engine.ast.ThisObjectValue; import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.ast.ValueExpr; @@ -210,24 +212,54 @@ private static List createClassAnnotations( // @ConditionalOnProperty(value = "spring.cloud.gcp.language.enabled", matchIfMissing = true) // @EnableConfigurationProperties(LanguageProperties.class) - // TODO: AnnotationNode description only accepts String for now. need to extend to params - // and classes. + AssignmentExpr valueStringAssignmentExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable( + Variable.builder().setName("value").setType(TypeNode.STRING).build())) + .setValueExpr( + ValueExpr.withValue( + StringObjectValue.withValue( + Utils.springPropertyPrefix(libName, service.name()) + ".enabled"))) + .build(); + AssignmentExpr matchIfMissingAssignmentExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable( + Variable.builder().setName("matchIfMissing").setType(TypeNode.BOOLEAN).build())) + .setValueExpr( + ValueExpr.withValue( + PrimitiveValue.builder().setValue("false").setType(TypeNode.BOOLEAN).build())) + .build(); AnnotationNode conditionalOnPropertyNode = AnnotationNode.builder() .setType(types.get("ConditionalOnProperty")) - .setDescription( - "value = \"" - + Utils.springPropertyPrefix(libName, service.name()) - + ".enabled\", matchIfMissing = false") + .addDescription(valueStringAssignmentExpr) + .addDescription(matchIfMissingAssignmentExpr) .build(); + AnnotationNode conditionalOnClassNode = AnnotationNode.builder() .setType(types.get("ConditionalOnClass")) .setDescription( - "value = " - + ClassNames.getServiceClientClassName(service) - + ".class") // TODO: change after annotation feature merged. need to produce - // XXX.class + VariableExpr.builder() + .setVariable( + Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build()) + .setStaticReferenceType(types.get("ServiceClient")) + .build()) + .build(); + + AssignmentExpr proxyBeanMethodsAssignmentExpr = + AssignmentExpr.builder() + .setVariableExpr( + VariableExpr.withVariable( + Variable.builder() + .setName("proxyBeanMethods") + .setType(TypeNode.BOOLEAN) + .build())) + .setValueExpr( + ValueExpr.withValue( + PrimitiveValue.builder().setValue("false").setType(TypeNode.BOOLEAN).build())) .build(); AnnotationNode configurationNode = AnnotationNode.builder().setType(types.get("AutoConfiguration")).build(); @@ -235,9 +267,13 @@ private static List createClassAnnotations( AnnotationNode.builder() .setType(types.get("EnableConfigurationProperties")) .setDescription( - types.get(service.name() + "Properties").reference().name() - + ".Class") // TODO: change to parameters + VariableExpr.builder() + .setVariable( + Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build()) + .setStaticReferenceType(types.get(service.name() + "Properties")) + .build()) .build(); + return Arrays.asList( AnnotationNode.builder() .setType(STATIC_TYPES.get("Generated")) @@ -702,14 +738,35 @@ private static MethodDefinition createClientBeanMethod( String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; + String transportChannelProviderName = "default" + service.name() + "TransportChannelProvider"; + String credentialsProviderName = "googleCredentials"; + return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) .setArguments( Arrays.asList( - credentialsProviderVariableExpr.toBuilder().setIsDecl(true).build(), - transportChannelProviderVariableExpr.toBuilder().setIsDecl(true).build())) + credentialsProviderVariableExpr + .toBuilder() + .setIsDecl(true) + .setAnnotations( + Arrays.asList( + AnnotationNode.builder() + .setType(types.get("Qualifier")) + .setDescription(credentialsProviderName) + .build())) + .build(), + transportChannelProviderVariableExpr + .toBuilder() + .setIsDecl(true) + .setAnnotations( + Arrays.asList( + AnnotationNode.builder() + .setType(types.get("Qualifier")) + .setDescription(transportChannelProviderName) + .build())) + .build())) .setAnnotations( Arrays.asList( AnnotationNode.withType(types.get("Bean")), @@ -858,6 +915,13 @@ private static Map createDynamicTypes(Service service, String .setPakkage("org.springframework.boot.autoconfigure.condition") .build()); + TypeNode qualifier = + TypeNode.withReference( + VaporReference.builder() + .setName("Qualifier") + .setPakkage("org.springframework.beans.factory.annotation") + .build()); + typeMap.put("CredentialsProvider", credentialsProvider); typeMap.put(service.name() + "Properties", clientProperties); typeMap.put(service.name() + "AutoConfig", clientAutoconfig); @@ -873,6 +937,7 @@ private static Map createDynamicTypes(Service service, String typeMap.put("ConditionalOnMissingBean", conditionalOnMissingBean); typeMap.put("ConditionalOnProperty", conditionalOnProperty); typeMap.put("ConditionalOnClass", conditionalOnClass); + typeMap.put("Qualifier", qualifier); return typeMap; } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 949e34c4de..aff2bcbe2d 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -92,12 +92,17 @@ public GapicClass generate(GapicContext context, Service service) { } private static ExprStatement createMemberVarStatement( - String varName, TypeNode varType, boolean isFinal, Expr defaultVal) { + String varName, + TypeNode varType, + boolean isFinal, + Expr defaultVal, + List annotationNodes) { Variable memberVar = Variable.builder().setName(varName).setType(varType).build(); VariableExpr memberVarExpr = VariableExpr.builder() .setVariable(memberVar) .setScope(ScopeNode.PRIVATE) + .setAnnotations(annotationNodes == null ? Collections.emptyList() : annotationNodes) .setIsDecl(true) .setIsFinal(isFinal) .build(); @@ -133,22 +138,30 @@ private static List createMemberVariables( .map(x -> ValueExpr.withValue(StringObjectValue.withValue(x))) .collect(Collectors.toList())) .build(); - // TODO: credentials field needs annotation. + // Note that the annotations are set on the VariableExpr rather than the ExprStatement. + // The single annotation works fine here, + // but multiple annotations would be written to the same line + List credentialsAnnotations = + Arrays.asList(AnnotationNode.withType(types.get("NestedConfigurationProperty"))); ExprStatement credentialsStatement = createMemberVarStatement( - "credentials", types.get("Credentials"), true, defaultCredentialScopes); + "credentials", + types.get("Credentials"), + true, + defaultCredentialScopes, + credentialsAnnotations); // private String quotaProjectId; ExprStatement quotaProjectIdVarStatement = - createMemberVarStatement("quotaProjectId", TypeNode.STRING, false, null); + createMemberVarStatement("quotaProjectId", TypeNode.STRING, false, null, null); // private Integer executorThreadCount; ExprStatement executorThreadCountVarStatement = - createMemberVarStatement("executorThreadCount", TypeNode.INT_OBJECT, false, null); + createMemberVarStatement("executorThreadCount", TypeNode.INT_OBJECT, false, null, null); // private boolean useRest = false; ExprStatement useRestVarStatement = - createMemberVarStatement("useRest", TypeNode.BOOLEAN, false, null); + createMemberVarStatement("useRest", TypeNode.BOOLEAN, false, null, null); // // private static final ImmutableMap RETRY_PARAM_DEFINITIONS; @@ -170,7 +183,7 @@ private static List createMemberVariables( } String propertyName = Joiner.on("").join(methodAndPropertyName); ExprStatement retrySettingsStatement = - createMemberVarStatement(propertyName, propertyType, false, null); + createMemberVarStatement(propertyName, propertyType, false, null, null); getterAndSetter.add(retrySettingsStatement); return getterAndSetter; }, diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 70505f6761..2e2f6c5653 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -129,10 +129,11 @@ public void generatePropertiesClazzTest() { + "\n" + "@Generated(\"by gapic-generator-java\")\n" + "@AutoConfiguration\n" - + "@ConditionalOnClass(\"value = EchoClient.class\")\n" + + "@ConditionalOnClass(EchoClient.class)\n" + "@ConditionalOnProperty(\n" - + " \"value = \\\"spring.cloud.gcp.autoconfig.showcase.echo.enabled\\\", matchIfMissing = false\")\n" - + "@EnableConfigurationProperties(\"EchoSpringProperties.Class\")\n" + + " value = \"spring.cloud.gcp.autoconfig.showcase.echo.enabled\",\n" + + " matchIfMissing = false)\n" + + "@EnableConfigurationProperties(EchoSpringProperties.class)\n" + "public class EchoSpringAutoConfiguration {\n" + " private final EchoSpringProperties clientProperties;\n" + "\n" @@ -156,8 +157,9 @@ public void generatePropertiesClazzTest() { + " @Bean\n" + " @ConditionalOnMissingBean\n" + " public EchoClient echoClient(\n" - + " CredentialsProvider credentialsProvider,\n" - + " TransportChannelProvider defaultTransportChannelProvider)\n" + + " @Qualifier(\"googleCredentials\") CredentialsProvider credentialsProvider,\n" + + " @Qualifier(\"defaultEchoTransportChannelProvider\")\n" + + " TransportChannelProvider defaultTransportChannelProvider)\n" + " throws IOException {\n" + " EchoSettings.Builder clientSettingsBuilder =\n" + " EchoSettings.newBuilder()\n" @@ -412,8 +414,10 @@ public void generatePropertiesClazzTest() { + "\n" + "@ConfigurationProperties(\"spring.cloud.gcp.autoconfig.showcase.echo\")\n" + "public class EchoSpringProperties implements CredentialsSupplier {\n" + + " @NestedConfigurationProperty\n" + " private final Credentials credentials =\n" + " new Credentials(\"https://www.googleapis.com/auth/cloud-platform\");\n" + + "\n" + " private String quotaProjectId;\n" + " private Integer executorThreadCount;\n" + " private boolean useRest;\n" From 8de6c5cbe5d6627d12d1b641b0453075cef1db47 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Fri, 7 Oct 2022 10:34:49 -0400 Subject: [PATCH 039/103] fix(Spring CodeGen): Use service-specific CredentialsProvider in annotation (#1055) Renames credential provider from googleCredentials to [serviceName]Credentials in both qualifier annotation and generated method definition. --- .../SpringAutoConfigClassComposer.java | 42 +++++++++++-------- .../SpringAutoConfigClassComposerTest.java | 4 +- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 016ac0fb4a..b9cf9f8712 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -81,8 +81,13 @@ public static SpringAutoConfigClassComposer instance() { public GapicClass generate(GapicContext context, Service service) { String packageName = service.pakkage() + ".spring"; Map types = createDynamicTypes(service, packageName); - String className = getThisClassName(service.name()); + String serviceName = service.name(); + String serviceNameLowerCamel = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); + String className = getThisClassName(serviceName); String libName = Utils.getLibName(context); + String credentialsProviderName = serviceNameLowerCamel + "Credentials"; + String transportChannelProviderName = "default" + serviceName + "TransportChannelProvider"; + String clientName = serviceNameLowerCamel + "Client"; GapicClass.Kind kind = Kind.MAIN; GapicServiceConfig gapicServiceConfig = context.serviceConfig(); @@ -98,9 +103,18 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods( Arrays.asList( createConstructor(service.name(), className, types), - createCredentialsProviderBeanMethod(service, className, types), - createTransportChannelProviderBeanMethod(service, types), - createClientBeanMethod(service, className, types, gapicServiceConfig))) + createCredentialsProviderBeanMethod( + service, className, credentialsProviderName, types), + createTransportChannelProviderBeanMethod( + service, transportChannelProviderName, types), + createClientBeanMethod( + service, + className, + credentialsProviderName, + transportChannelProviderName, + clientName, + types, + gapicServiceConfig))) .setAnnotations(createClassAnnotations(service, types, libName)) .build(); return GapicClass.create(kind, classDef); @@ -286,10 +300,10 @@ private static List createClassAnnotations( } private static MethodDefinition createCredentialsProviderBeanMethod( - Service service, String className, Map types) { + Service service, String className, String methodName, Map types) { // @Bean // @ConditionalOnMissingBean - // public CredentialsProvider googleCredentials() throws IOException { + // public CredentialsProvider languageServiceCredentials() throws IOException { // return new DefaultCredentialsProvider(this.clientProperties); // } @@ -315,7 +329,6 @@ private static MethodDefinition createCredentialsProviderBeanMethod( .setType(types.get("CredentialsProvider")) .build(); - String methodName = "googleCredentials"; return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) @@ -330,7 +343,7 @@ private static MethodDefinition createCredentialsProviderBeanMethod( } private static MethodDefinition createTransportChannelProviderBeanMethod( - Service service, Map types) { + Service service, String methodName, Map types) { // @Bean // @ConditionalOnMissingBean @@ -345,7 +358,6 @@ private static MethodDefinition createTransportChannelProviderBeanMethod( .setReturnType(STATIC_TYPES.get("TransportChannelProvider")) .build(); - String methodName = "default" + service.name() + "TransportChannelProvider"; return MethodDefinition.builder() .setName(methodName) .setScope(ScopeNode.PUBLIC) @@ -442,9 +454,11 @@ private static Statement setRetrySettingsForMethod( private static MethodDefinition createClientBeanMethod( Service service, String className, + String credentialsProviderName, + String transportChannelProviderName, + String clientName, Map types, GapicServiceConfig gapicServiceConfig) { - // argument variables: VariableExpr credentialsProviderVariableExpr = VariableExpr.withVariable( @@ -735,14 +749,8 @@ private static MethodDefinition createClientBeanMethod( .setArguments(serviceSettingsBuilt) .build(); - String methodName = - CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; - - String transportChannelProviderName = "default" + service.name() + "TransportChannelProvider"; - String credentialsProviderName = "googleCredentials"; - return MethodDefinition.builder() - .setName(methodName) + .setName(clientName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) .setArguments( diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java index 2e2f6c5653..9217aab940 100644 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java @@ -144,7 +144,7 @@ public void generatePropertiesClazzTest() { + "\n" + " @Bean\n" + " @ConditionalOnMissingBean\n" - + " public CredentialsProvider googleCredentials() throws IOException {\n" + + " public CredentialsProvider echoCredentials() throws IOException {\n" + " return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));\n" + " }\n" + "\n" @@ -157,7 +157,7 @@ public void generatePropertiesClazzTest() { + " @Bean\n" + " @ConditionalOnMissingBean\n" + " public EchoClient echoClient(\n" - + " @Qualifier(\"googleCredentials\") CredentialsProvider credentialsProvider,\n" + + " @Qualifier(\"echoCredentials\") CredentialsProvider credentialsProvider,\n" + " @Qualifier(\"defaultEchoTransportChannelProvider\")\n" + " TransportChannelProvider defaultTransportChannelProvider)\n" + " throws IOException {\n" From 2b11de7c67ea294451b8a4d9d246100735d0b1c7 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Tue, 11 Oct 2022 09:22:47 -0400 Subject: [PATCH 040/103] test(Spring CodeGen): Set up golden file tests for spring class composers (#1052) * Separates SpringPropertiesClassComposerTest from SpringAutoConfigClassComposerTest * Replaces string comparisons with golden file testing --- .../SpringAutoConfigClassComposerTest.java | 895 ------------------ .../generator/spring/SpringComposerTest.java | 137 --- .../SpringAutoConfigClassComposerTest.java | 42 + .../spring/composer/SpringComposerTest.java | 44 + .../SpringPropertiesClassComposerTest.java | 42 + .../EchoSpringAutoConfiguration.golden | 295 ++++++ .../EchoSpringAutoConfigurationFull.golden | 311 ++++++ .../goldens/EchoSpringProperties.golden | 484 ++++++++++ .../goldens/EchoSpringPropertiesFull.golden | 500 ++++++++++ 9 files changed, 1718 insertions(+), 1032 deletions(-) delete mode 100644 src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java delete mode 100644 src/test/java/com/google/api/generator/spring/SpringComposerTest.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden diff --git a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java deleted file mode 100644 index 9217aab940..0000000000 --- a/src/test/java/com/google/api/generator/spring/SpringAutoConfigClassComposerTest.java +++ /dev/null @@ -1,895 +0,0 @@ -// 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.spring; - -import static junit.framework.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import com.google.api.generator.engine.writer.JavaWriterVisitor; -import com.google.api.generator.gapic.composer.common.TestProtoLoader; -import com.google.api.generator.gapic.model.GapicClass; -import com.google.api.generator.gapic.model.GapicContext; -import com.google.api.generator.gapic.model.GapicServiceConfig; -import com.google.api.generator.gapic.model.Message; -import com.google.api.generator.gapic.model.ResourceName; -import com.google.api.generator.gapic.model.Service; -import com.google.api.generator.gapic.model.Transport; -import com.google.api.generator.gapic.protoparser.Parser; -import com.google.api.generator.gapic.protoparser.ServiceConfigParser; -import com.google.api.generator.spring.composer.SpringAutoConfigClassComposer; -import com.google.api.generator.spring.composer.SpringPropertiesClassComposer; -import com.google.protobuf.Descriptors.FileDescriptor; -import com.google.protobuf.Descriptors.ServiceDescriptor; -import com.google.showcase.v1beta1.EchoOuterClass; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import org.junit.Before; -import org.junit.Test; - -public class SpringAutoConfigClassComposerTest { - private ServiceDescriptor echoService; - private FileDescriptor echoFileDescriptor; - private GapicContext context; - private Service echoProtoService; - - @Before - public void setUp() { - echoFileDescriptor = EchoOuterClass.getDescriptor(); - - echoService = echoFileDescriptor.getServices().get(0); - assertEquals(echoService.getName(), "Echo"); - - Map messageTypes = Parser.parseMessages(echoFileDescriptor); - - Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); - Set outputResourceNames = new HashSet<>(); - - List services = - Parser.parseService( - echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); - - String jsonFilename = "showcase_grpc_service_config.json"; - Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); - Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); - assertTrue(serviceConfigOpt.isPresent()); - GapicServiceConfig serviceConfig = serviceConfigOpt.get(); - - this.context = - GapicContext.builder() - .setMessages(messageTypes) - .setResourceNames(resourceNames) - .setServices(services) - .setHelperResourceNames(outputResourceNames) - .setTransport(Transport.GRPC) - .setServiceConfig(serviceConfig) - .build(); - - this.echoProtoService = services.get(0); - } - - @Test - public void generateAutoConfigClazzTest() { - GapicClass clazz = - SpringAutoConfigClassComposer.instance().generate(this.context, this.echoProtoService); - - JavaWriterVisitor visitor = new JavaWriterVisitor(); - clazz.classDefinition().accept(visitor); - assertEquals(EXPECTED_AUTOCONFIG_CLASS_STRING, visitor.write()); - } - - @Test - public void generatePropertiesClazzTest() { - - GapicClass clazz = - SpringPropertiesClassComposer.instance().generate(this.context, this.echoProtoService); - - JavaWriterVisitor visitor = new JavaWriterVisitor(); - clazz.classDefinition().accept(visitor); - System.out.println(visitor.write()); - assertEquals(EXPECTED_PROPERTY_CLASS_STRING, visitor.write()); - } - - protected static final String EXPECTED_AUTOCONFIG_CLASS_STRING = - "package com.google.showcase.v1beta1.spring;\n" - + "\n" - + "import com.google.api.gax.core.CredentialsProvider;\n" - + "import com.google.api.gax.core.ExecutorProvider;\n" - + "import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;\n" - + "import com.google.api.gax.retrying.RetrySettings;\n" - + "import com.google.api.gax.rpc.TransportChannelProvider;\n" - + "import com.google.cloud.spring.core.DefaultCredentialsProvider;\n" - + "import com.google.showcase.v1beta1.EchoClient;\n" - + "import com.google.showcase.v1beta1.EchoSettings;\n" - + "import java.io.IOException;\n" - + "import javax.annotation.Generated;\n" - + "import org.springframework.boot.autoconfigure.AutoConfiguration;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;\n" - + "import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\n" - + "import org.springframework.boot.context.properties.EnableConfigurationProperties;\n" - + "import org.springframework.context.annotation.Bean;\n" - + "import org.threeten.bp.Duration;\n" - + "\n" - + "@Generated(\"by gapic-generator-java\")\n" - + "@AutoConfiguration\n" - + "@ConditionalOnClass(EchoClient.class)\n" - + "@ConditionalOnProperty(\n" - + " value = \"spring.cloud.gcp.autoconfig.showcase.echo.enabled\",\n" - + " matchIfMissing = false)\n" - + "@EnableConfigurationProperties(EchoSpringProperties.class)\n" - + "public class EchoSpringAutoConfiguration {\n" - + " private final EchoSpringProperties clientProperties;\n" - + "\n" - + " protected EchoSpringAutoConfiguration(" - + "EchoSpringProperties clientProperties) {\n" - + " this.clientProperties = clientProperties;\n" - + " }\n" - + "\n" - + " @Bean\n" - + " @ConditionalOnMissingBean\n" - + " public CredentialsProvider echoCredentials() throws IOException {\n" - + " return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));\n" - + " }\n" - + "\n" - + " @Bean\n" - + " @ConditionalOnMissingBean\n" - + " public TransportChannelProvider defaultEchoTransportChannelProvider() {\n" - + " return EchoSettings.defaultTransportChannelProvider();\n" - + " }\n" - + "\n" - + " @Bean\n" - + " @ConditionalOnMissingBean\n" - + " public EchoClient echoClient(\n" - + " @Qualifier(\"echoCredentials\") CredentialsProvider credentialsProvider,\n" - + " @Qualifier(\"defaultEchoTransportChannelProvider\")\n" - + " TransportChannelProvider defaultTransportChannelProvider)\n" - + " throws IOException {\n" - + " EchoSettings.Builder clientSettingsBuilder =\n" - + " EchoSettings.newBuilder()\n" - + " .setCredentialsProvider(credentialsProvider)\n" - + " .setTransportChannelProvider(defaultTransportChannelProvider)\n" - + " .setHeaderProvider();\n" - + " if (this.clientProperties.getQuotaProjectId() != null) {\n" - + " clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());\n" - + " }\n" - + " if (this.clientProperties.getExecutorThreadCount() != null) {\n" - + " ExecutorProvider executorProvider =\n" - + " EchoSettings.defaultExecutorProviderBuilder()\n" - + " .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())\n" - + " .build();\n" - + " clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);\n" - + " }\n" - + " if (this.clientProperties.getUseRest()) {\n" - + " clientSettingsBuilder.setTransportChannelProvider(\n" - + " EchoSettings.defaultHttpJsonTransportProviderBuilder().build());\n" - + " }\n" - + " RetrySettings.Builder echoRetrySettingBuilder =\n" - + " clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getEchoInitialRetryDelay() != null) {\n" - + " echoRetrySettingBuilder.setInitialRetryDelay(\n" - + " this.clientProperties.getEchoInitialRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getEchoRetryDelayMultiplier() != null) {\n" - + " echoRetrySettingBuilder.setRetryDelayMultiplier(\n" - + " this.clientProperties.getEchoRetryDelayMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getEchoMaxRetryDelay() != null) {\n" - + " echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getEchoInitialRpcTimeout() != null) {\n" - + " echoRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getEchoInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) {\n" - + " echoRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getEchoRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getEchoMaxRpcTimeout() != null) {\n" - + " echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getEchoTotalTimeout() != null) {\n" - + " echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build());\n" - + " RetrySettings.Builder expandRetrySettingBuilder =\n" - + " clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getExpandInitialRetryDelay() != null) {\n" - + " expandRetrySettingBuilder.setInitialRetryDelay(\n" - + " this.clientProperties.getExpandInitialRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getExpandRetryDelayMultiplier() != null) {\n" - + " expandRetrySettingBuilder.setRetryDelayMultiplier(\n" - + " this.clientProperties.getExpandRetryDelayMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getExpandMaxRetryDelay() != null) {\n" - + " expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getExpandInitialRpcTimeout() != null) {\n" - + " expandRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getExpandInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) {\n" - + " expandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getExpandRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getExpandMaxRpcTimeout() != null) {\n" - + " expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getExpandTotalTimeout() != null) {\n" - + " expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build());\n" - + " RetrySettings.Builder collectRetrySettingBuilder =\n" - + " clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getCollectInitialRpcTimeout() != null) {\n" - + " collectRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getCollectInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) {\n" - + " collectRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getCollectRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getCollectMaxRpcTimeout() != null) {\n" - + " collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getCollectTotalTimeout() != null) {\n" - + " collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build());\n" - + " RetrySettings.Builder chatRetrySettingBuilder =\n" - + " clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getChatInitialRpcTimeout() != null) {\n" - + " chatRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getChatInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) {\n" - + " chatRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getChatRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getChatMaxRpcTimeout() != null) {\n" - + " chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getChatTotalTimeout() != null) {\n" - + " chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build());\n" - + " RetrySettings.Builder chatAgainRetrySettingBuilder =\n" - + " clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) {\n" - + " chatAgainRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getChatAgainInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) {\n" - + " chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getChatAgainRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) {\n" - + " chatAgainRetrySettingBuilder.setMaxRpcTimeout(\n" - + " this.clientProperties.getChatAgainMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getChatAgainTotalTimeout() != null) {\n" - + " chatAgainRetrySettingBuilder.setTotalTimeout(\n" - + " this.clientProperties.getChatAgainTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder\n" - + " .chatAgainSettings()\n" - + " .setRetrySettings(chatAgainRetrySettingBuilder.build());\n" - + " RetrySettings.Builder pagedExpandRetrySettingBuilder =\n" - + " clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) {\n" - + " pagedExpandRetrySettingBuilder.setInitialRetryDelay(\n" - + " this.clientProperties.getPagedExpandInitialRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) {\n" - + " pagedExpandRetrySettingBuilder.setRetryDelayMultiplier(\n" - + " this.clientProperties.getPagedExpandRetryDelayMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) {\n" - + " pagedExpandRetrySettingBuilder.setMaxRetryDelay(\n" - + " this.clientProperties.getPagedExpandMaxRetryDelay());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) {\n" - + " pagedExpandRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getPagedExpandInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) {\n" - + " pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getPagedExpandRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) {\n" - + " pagedExpandRetrySettingBuilder.setMaxRpcTimeout(\n" - + " this.clientProperties.getPagedExpandMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getPagedExpandTotalTimeout() != null) {\n" - + " pagedExpandRetrySettingBuilder.setTotalTimeout(\n" - + " this.clientProperties.getPagedExpandTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder\n" - + " .pagedExpandSettings()\n" - + " .setRetrySettings(pagedExpandRetrySettingBuilder.build());\n" - + " RetrySettings.Builder simplePagedExpandRetrySettingBuilder =\n" - + " clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) {\n" - + " simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getSimplePagedExpandInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) {\n" - + " simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) {\n" - + " simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout(\n" - + " this.clientProperties.getSimplePagedExpandMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) {\n" - + " simplePagedExpandRetrySettingBuilder.setTotalTimeout(\n" - + " this.clientProperties.getSimplePagedExpandTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder\n" - + " .simplePagedExpandSettings()\n" - + " .setRetrySettings(simplePagedExpandRetrySettingBuilder.build());\n" - + " RetrySettings.Builder waitRetrySettingBuilder =\n" - + " clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getWaitInitialRpcTimeout() != null) {\n" - + " waitRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getWaitInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) {\n" - + " waitRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getWaitRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getWaitMaxRpcTimeout() != null) {\n" - + " waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getWaitTotalTimeout() != null) {\n" - + " waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build());\n" - + " RetrySettings.Builder blockRetrySettingBuilder =\n" - + " clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getBlockInitialRpcTimeout() != null) {\n" - + " blockRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getBlockInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) {\n" - + " blockRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getBlockRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getBlockMaxRpcTimeout() != null) {\n" - + " blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getBlockTotalTimeout() != null) {\n" - + " blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build());\n" - + " RetrySettings.Builder collideNameRetrySettingBuilder =\n" - + " clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder();\n" - + " if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) {\n" - + " collideNameRetrySettingBuilder.setInitialRpcTimeout(\n" - + " this.clientProperties.getCollideNameInitialRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) {\n" - + " collideNameRetrySettingBuilder.setRpcTimeoutMultiplier(\n" - + " this.clientProperties.getCollideNameRpcTimeoutMultiplier());\n" - + " }\n" - + " if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) {\n" - + " collideNameRetrySettingBuilder.setMaxRpcTimeout(\n" - + " this.clientProperties.getCollideNameMaxRpcTimeout());\n" - + " }\n" - + " if (this.clientProperties.getCollideNameTotalTimeout() != null) {\n" - + " collideNameRetrySettingBuilder.setTotalTimeout(\n" - + " this.clientProperties.getCollideNameTotalTimeout());\n" - + " }\n" - + " clientSettingsBuilder\n" - + " .collideNameSettings()\n" - + " .setRetrySettings(collideNameRetrySettingBuilder.build());\n" - + " return EchoClient.create(clientSettingsBuilder.build());\n" - + " }\n" - + "}\n"; - - protected static final String EXPECTED_PROPERTY_CLASS_STRING = - "package com.google.showcase.v1beta1.spring;\n" - + "\n" - + "import com.google.cloud.spring.core.Credentials;\n" - + "import com.google.cloud.spring.core.CredentialsSupplier;\n" - + "import org.springframework.boot.context.properties.ConfigurationProperties;\n" - + "import org.threeten.bp.Duration;\n" - + "\n" - + "@ConfigurationProperties(\"spring.cloud.gcp.autoconfig.showcase.echo\")\n" - + "public class EchoSpringProperties implements CredentialsSupplier {\n" - + " @NestedConfigurationProperty\n" - + " private final Credentials credentials =\n" - + " new Credentials(\"https://www.googleapis.com/auth/cloud-platform\");\n" - + "\n" - + " private String quotaProjectId;\n" - + " private Integer executorThreadCount;\n" - + " private boolean useRest;\n" - // retry settings per method, no default set - // checks for null in autoconfig class when using - + " private Duration echoInitialRetryDelay;\n" - + " private Double echoRetryDelayMultiplier;\n" - + " private Duration echoMaxRetryDelay;\n" - + " private Duration echoInitialRpcTimeout;\n" - + " private Double echoRpcTimeoutMultiplier;\n" - + " private Duration echoMaxRpcTimeout;\n" - + " private Duration echoTotalTimeout;\n" - + " private Duration expandInitialRetryDelay;\n" - + " private Double expandRetryDelayMultiplier;\n" - + " private Duration expandMaxRetryDelay;\n" - + " private Duration expandInitialRpcTimeout;\n" - + " private Double expandRpcTimeoutMultiplier;\n" - + " private Duration expandMaxRpcTimeout;\n" - + " private Duration expandTotalTimeout;\n" - + " private Duration collectInitialRpcTimeout;\n" - + " private Double collectRpcTimeoutMultiplier;\n" - + " private Duration collectMaxRpcTimeout;\n" - + " private Duration collectTotalTimeout;\n" - + " private Duration chatInitialRpcTimeout;\n" - + " private Double chatRpcTimeoutMultiplier;\n" - + " private Duration chatMaxRpcTimeout;\n" - + " private Duration chatTotalTimeout;\n" - + " private Duration chatAgainInitialRpcTimeout;\n" - + " private Double chatAgainRpcTimeoutMultiplier;\n" - + " private Duration chatAgainMaxRpcTimeout;\n" - + " private Duration chatAgainTotalTimeout;\n" - + " private Duration pagedExpandInitialRetryDelay;\n" - + " private Double pagedExpandRetryDelayMultiplier;\n" - + " private Duration pagedExpandMaxRetryDelay;\n" - + " private Duration pagedExpandInitialRpcTimeout;\n" - + " private Double pagedExpandRpcTimeoutMultiplier;\n" - + " private Duration pagedExpandMaxRpcTimeout;\n" - + " private Duration pagedExpandTotalTimeout;\n" - + " private Duration simplePagedExpandInitialRpcTimeout;\n" - + " private Double simplePagedExpandRpcTimeoutMultiplier;\n" - + " private Duration simplePagedExpandMaxRpcTimeout;\n" - + " private Duration simplePagedExpandTotalTimeout;\n" - + " private Duration waitInitialRpcTimeout;\n" - + " private Double waitRpcTimeoutMultiplier;\n" - + " private Duration waitMaxRpcTimeout;\n" - + " private Duration waitTotalTimeout;\n" - + " private Duration blockInitialRpcTimeout;\n" - + " private Double blockRpcTimeoutMultiplier;\n" - + " private Duration blockMaxRpcTimeout;\n" - + " private Duration blockTotalTimeout;\n" - + " private Duration collideNameInitialRpcTimeout;\n" - + " private Double collideNameRpcTimeoutMultiplier;\n" - + " private Duration collideNameMaxRpcTimeout;\n" - + " private Duration collideNameTotalTimeout;\n" - + "\n" - + " @Override\n" - + " public Credentials getCredentials() {\n" - + " return this.credentials;\n" - + " }\n" - + "\n" - + " public String getQuotaProjectId() {\n" - + " return this.quotaProjectId;\n" - + " }\n" - + "\n" - + " public void setQuotaProjectId(String quotaProjectId) {\n" - + " this.quotaProjectId = quotaProjectId;\n" - + " }\n" - + "\n" - + " public boolean getUseRest() {\n" - + " return this.useRest;\n" - + " }\n" - + "\n" - + " public Integer getExecutorThreadCount() {\n" - + " return this.executorThreadCount;\n" - + " }\n" - + "\n" - + " public void setExecutorThreadCount(Integer executorThreadCount) {\n" - + " this.executorThreadCount = executorThreadCount;\n" - + " }\n" - + "\n" - // getters and setters for retry settings. - + " public Duration getEchoInitialRetryDelay() {\n" - + " return this.echoInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) {\n" - + " this.echoInitialRetryDelay = echoInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public Double getEchoRetryDelayMultiplier() {\n" - + " return this.echoRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public void setEchoRetryDelayMultiplier(Double echoRetryDelayMultiplier) {\n" - + " this.echoRetryDelayMultiplier = echoRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getEchoMaxRetryDelay() {\n" - + " return this.echoMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) {\n" - + " this.echoMaxRetryDelay = echoMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public Duration getEchoInitialRpcTimeout() {\n" - + " return this.echoInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) {\n" - + " this.echoInitialRpcTimeout = echoInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getEchoRpcTimeoutMultiplier() {\n" - + " return this.echoRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setEchoRpcTimeoutMultiplier(Double echoRpcTimeoutMultiplier) {\n" - + " this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getEchoMaxRpcTimeout() {\n" - + " return this.echoMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) {\n" - + " this.echoMaxRpcTimeout = echoMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getEchoTotalTimeout() {\n" - + " return this.echoTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setEchoTotalTimeout(Duration echoTotalTimeout) {\n" - + " this.echoTotalTimeout = echoTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getExpandInitialRetryDelay() {\n" - + " return this.expandInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) {\n" - + " this.expandInitialRetryDelay = expandInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public Double getExpandRetryDelayMultiplier() {\n" - + " return this.expandRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public void setExpandRetryDelayMultiplier(Double expandRetryDelayMultiplier) {\n" - + " this.expandRetryDelayMultiplier = expandRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getExpandMaxRetryDelay() {\n" - + " return this.expandMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) {\n" - + " this.expandMaxRetryDelay = expandMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public Duration getExpandInitialRpcTimeout() {\n" - + " return this.expandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) {\n" - + " this.expandInitialRpcTimeout = expandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getExpandRpcTimeoutMultiplier() {\n" - + " return this.expandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setExpandRpcTimeoutMultiplier(Double expandRpcTimeoutMultiplier) {\n" - + " this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getExpandMaxRpcTimeout() {\n" - + " return this.expandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) {\n" - + " this.expandMaxRpcTimeout = expandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getExpandTotalTimeout() {\n" - + " return this.expandTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setExpandTotalTimeout(Duration expandTotalTimeout) {\n" - + " this.expandTotalTimeout = expandTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getCollectInitialRpcTimeout() {\n" - + " return this.collectInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) {\n" - + " this.collectInitialRpcTimeout = collectInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getCollectRpcTimeoutMultiplier() {\n" - + " return this.collectRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setCollectRpcTimeoutMultiplier(Double collectRpcTimeoutMultiplier) {\n" - + " this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getCollectMaxRpcTimeout() {\n" - + " return this.collectMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) {\n" - + " this.collectMaxRpcTimeout = collectMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getCollectTotalTimeout() {\n" - + " return this.collectTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setCollectTotalTimeout(Duration collectTotalTimeout) {\n" - + " this.collectTotalTimeout = collectTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getChatInitialRpcTimeout() {\n" - + " return this.chatInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) {\n" - + " this.chatInitialRpcTimeout = chatInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getChatRpcTimeoutMultiplier() {\n" - + " return this.chatRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setChatRpcTimeoutMultiplier(Double chatRpcTimeoutMultiplier) {\n" - + " this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getChatMaxRpcTimeout() {\n" - + " return this.chatMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) {\n" - + " this.chatMaxRpcTimeout = chatMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getChatTotalTimeout() {\n" - + " return this.chatTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setChatTotalTimeout(Duration chatTotalTimeout) {\n" - + " this.chatTotalTimeout = chatTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getChatAgainInitialRpcTimeout() {\n" - + " return this.chatAgainInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) {\n" - + " this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getChatAgainRpcTimeoutMultiplier() {\n" - + " return this.chatAgainRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setChatAgainRpcTimeoutMultiplier(Double chatAgainRpcTimeoutMultiplier) {\n" - + " this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getChatAgainMaxRpcTimeout() {\n" - + " return this.chatAgainMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) {\n" - + " this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getChatAgainTotalTimeout() {\n" - + " return this.chatAgainTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) {\n" - + " this.chatAgainTotalTimeout = chatAgainTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getPagedExpandInitialRetryDelay() {\n" - + " return this.pagedExpandInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) {\n" - + " this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay;\n" - + " }\n" - + "\n" - + " public Double getPagedExpandRetryDelayMultiplier() {\n" - + " return this.pagedExpandRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public void setPagedExpandRetryDelayMultiplier(Double pagedExpandRetryDelayMultiplier) {\n" - + " this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getPagedExpandMaxRetryDelay() {\n" - + " return this.pagedExpandMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) {\n" - + " this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay;\n" - + " }\n" - + "\n" - + " public Duration getPagedExpandInitialRpcTimeout() {\n" - + " return this.pagedExpandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) {\n" - + " this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getPagedExpandRpcTimeoutMultiplier() {\n" - + " return this.pagedExpandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setPagedExpandRpcTimeoutMultiplier(Double pagedExpandRpcTimeoutMultiplier) {\n" - + " this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getPagedExpandMaxRpcTimeout() {\n" - + " return this.pagedExpandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) {\n" - + " this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getPagedExpandTotalTimeout() {\n" - + " return this.pagedExpandTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) {\n" - + " this.pagedExpandTotalTimeout = pagedExpandTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getSimplePagedExpandInitialRpcTimeout() {\n" - + " return this.simplePagedExpandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) {\n" - + " this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getSimplePagedExpandRpcTimeoutMultiplier() {\n" - + " return this.simplePagedExpandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setSimplePagedExpandRpcTimeoutMultiplier(\n" - + " Double simplePagedExpandRpcTimeoutMultiplier) {\n" - + " this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getSimplePagedExpandMaxRpcTimeout() {\n" - + " return this.simplePagedExpandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) {\n" - + " this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getSimplePagedExpandTotalTimeout() {\n" - + " return this.simplePagedExpandTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) {\n" - + " this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getWaitInitialRpcTimeout() {\n" - + " return this.waitInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) {\n" - + " this.waitInitialRpcTimeout = waitInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getWaitRpcTimeoutMultiplier() {\n" - + " return this.waitRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setWaitRpcTimeoutMultiplier(Double waitRpcTimeoutMultiplier) {\n" - + " this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getWaitMaxRpcTimeout() {\n" - + " return this.waitMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) {\n" - + " this.waitMaxRpcTimeout = waitMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getWaitTotalTimeout() {\n" - + " return this.waitTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setWaitTotalTimeout(Duration waitTotalTimeout) {\n" - + " this.waitTotalTimeout = waitTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getBlockInitialRpcTimeout() {\n" - + " return this.blockInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) {\n" - + " this.blockInitialRpcTimeout = blockInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getBlockRpcTimeoutMultiplier() {\n" - + " return this.blockRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setBlockRpcTimeoutMultiplier(Double blockRpcTimeoutMultiplier) {\n" - + " this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getBlockMaxRpcTimeout() {\n" - + " return this.blockMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) {\n" - + " this.blockMaxRpcTimeout = blockMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getBlockTotalTimeout() {\n" - + " return this.blockTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setBlockTotalTimeout(Duration blockTotalTimeout) {\n" - + " this.blockTotalTimeout = blockTotalTimeout;\n" - + " }\n" - + "\n" - + " public Duration getCollideNameInitialRpcTimeout() {\n" - + " return this.collideNameInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) {\n" - + " this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout;\n" - + " }\n" - + "\n" - + " public Double getCollideNameRpcTimeoutMultiplier() {\n" - + " return this.collideNameRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public void setCollideNameRpcTimeoutMultiplier(Double collideNameRpcTimeoutMultiplier) {\n" - + " this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier;\n" - + " }\n" - + "\n" - + " public Duration getCollideNameMaxRpcTimeout() {\n" - + " return this.collideNameMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) {\n" - + " this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout;\n" - + " }\n" - + "\n" - + " public Duration getCollideNameTotalTimeout() {\n" - + " return this.collideNameTotalTimeout;\n" - + " }\n" - + "\n" - + " public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) {\n" - + " this.collideNameTotalTimeout = collideNameTotalTimeout;\n" - + " }\n" - + "}\n"; -} diff --git a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/SpringComposerTest.java deleted file mode 100644 index eabbd62af9..0000000000 --- a/src/test/java/com/google/api/generator/spring/SpringComposerTest.java +++ /dev/null @@ -1,137 +0,0 @@ -// 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.spring; - -import static org.junit.Assert.assertTrue; - -import com.google.api.generator.engine.ast.ClassDefinition; -import com.google.api.generator.engine.writer.JavaWriterVisitor; -import com.google.api.generator.gapic.composer.common.TestProtoLoader; -import com.google.api.generator.gapic.model.GapicClass; -import com.google.api.generator.gapic.model.GapicContext; -import com.google.api.generator.gapic.model.GapicServiceConfig; -import com.google.api.generator.gapic.model.Message; -import com.google.api.generator.gapic.model.ResourceName; -import com.google.api.generator.gapic.model.Service; -import com.google.api.generator.gapic.model.Transport; -import com.google.api.generator.gapic.protoparser.Parser; -import com.google.api.generator.gapic.protoparser.ServiceConfigParser; -import com.google.api.generator.spring.composer.SpringComposer; -import com.google.protobuf.Descriptors.FileDescriptor; -import com.google.protobuf.Descriptors.ServiceDescriptor; -import com.google.showcase.v1beta1.EchoOuterClass; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class SpringComposerTest { - private GapicContext context; - - private String EXPECTED_CODE = - "/*\n" - + " * Copyright 2022 Google LLC\n" - + " *\n" - + " * Licensed under the Apache License, Version 2.0 (the \"License\");\n" - + " * you may not use this file except in compliance with the License.\n" - + " * You may obtain a copy of the License at\n" - + " *\n" - + " * https://www.apache.org/licenses/LICENSE-2.0\n" - + " *\n" - + " * Unless required by applicable law or agreed to in writing, software\n" - + " * distributed under the License is distributed on an \"AS IS\" BASIS,\n" - + " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" - + " * See the License for the specific language governing permissions and\n" - + " * limitations under the License.\n" - + " */\n" - + "\n" - + SpringAutoConfigClassComposerTest.EXPECTED_AUTOCONFIG_CLASS_STRING - + "/*\n" - + " * Copyright 2022 Google LLC\n" - + " *\n" - + " * Licensed under the Apache License, Version 2.0 (the \"License\");\n" - + " * you may not use this file except in compliance with the License.\n" - + " * You may obtain a copy of the License at\n" - + " *\n" - + " * https://www.apache.org/licenses/LICENSE-2.0\n" - + " *\n" - + " * Unless required by applicable law or agreed to in writing, software\n" - + " * distributed under the License is distributed on an \"AS IS\" BASIS,\n" - + " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" - + " * See the License for the specific language governing permissions and\n" - + " * limitations under the License.\n" - + " */\n" - + "\n" - + SpringAutoConfigClassComposerTest.EXPECTED_PROPERTY_CLASS_STRING; - - @Before - public void setUp() { - - FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor(); - ServiceDescriptor echoService = echoFileDescriptor.getServices().get(0); - Assert.assertEquals(echoService.getName(), "Echo"); - - Map messageTypes = Parser.parseMessages(echoFileDescriptor); - - Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); - Set outputResourceNames = new HashSet<>(); - - List services = - Parser.parseService( - echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); - - String jsonFilename = "showcase_grpc_service_config.json"; - Path jsonPath = Paths.get(TestProtoLoader.instance().getTestFilesDirectory(), jsonFilename); - Optional serviceConfigOpt = ServiceConfigParser.parse(jsonPath.toString()); - assertTrue(serviceConfigOpt.isPresent()); - GapicServiceConfig serviceConfig = serviceConfigOpt.get(); - - context = - GapicContext.builder() - .setMessages(messageTypes) - .setResourceNames(resourceNames) - .setServices(services) - .setHelperResourceNames(outputResourceNames) - .setTransport(Transport.GRPC) - .setServiceConfig(serviceConfig) - .build(); - } - - @Test - public void spring_composer_test() { - - List gapicClasses = SpringComposer.composeServiceAutoConfigClasses(context); - - // write to verify result for now - StringBuilder codeForAllClasses = new StringBuilder(); - JavaWriterVisitor codeWriter = new JavaWriterVisitor(); - for (GapicClass gapicClazz : gapicClasses) { - ClassDefinition clazz = gapicClazz.classDefinition(); - - clazz.accept(codeWriter); - String code = codeWriter.write(); - codeForAllClasses.append(code); - codeWriter.clear(); - } - - Assert.assertEquals(codeForAllClasses.toString(), EXPECTED_CODE); - } -} diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java new file mode 100644 index 0000000000..64f93c5df2 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java @@ -0,0 +1,42 @@ +// 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.spring.composer; + +import com.google.api.generator.gapic.composer.common.TestProtoLoader; +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 org.junit.Before; +import org.junit.Test; + +public class SpringAutoConfigClassComposerTest { + private GapicContext context; + private Service echoProtoService; + + @Before + public void setUp() { + this.context = TestProtoLoader.instance().parseShowcaseEcho(); + this.echoProtoService = this.context.services().get(0); + } + + @Test + public void generateAutoConfigClazzTest() { + GapicClass clazz = + SpringAutoConfigClassComposer.instance().generate(this.context, this.echoProtoService); + String fileName = clazz.classDefinition().classIdentifier() + ".golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java new file mode 100644 index 0000000000..3f2a1abb24 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java @@ -0,0 +1,44 @@ +// 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.spring.composer; + +import com.google.api.generator.gapic.composer.common.TestProtoLoader; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.test.framework.Assert; +import java.util.List; +import org.junit.Before; +import org.junit.Test; + +public class SpringComposerTest { + private GapicContext context; + + @Before + public void setUp() { + this.context = TestProtoLoader.instance().parseShowcaseEcho(); + } + + @Test + public void spring_composer_test() { + + List gapicClasses = SpringComposer.composeServiceAutoConfigClasses(context); + + // write to verify result for now + for (GapicClass gapicClazz : gapicClasses) { + String fileName = gapicClazz.classDefinition().classIdentifier() + "Full.golden"; + Assert.assertGoldenClass(this.getClass(), gapicClazz, fileName); + } + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java new file mode 100644 index 0000000000..f19298c067 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java @@ -0,0 +1,42 @@ +// 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.spring.composer; + +import com.google.api.generator.gapic.composer.common.TestProtoLoader; +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 org.junit.Before; +import org.junit.Test; + +public class SpringPropertiesClassComposerTest { + private GapicContext context; + private Service echoProtoService; + + @Before + public void setUp() { + this.context = TestProtoLoader.instance().parseShowcaseEcho(); + this.echoProtoService = this.context.services().get(0); + } + + @Test + public void generateAutoConfigClazzTest() { + GapicClass clazz = + SpringPropertiesClassComposer.instance().generate(this.context, this.echoProtoService); + String fileName = clazz.classDefinition().classIdentifier() + ".golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden new file mode 100644 index 0000000000..f7ba93e7da --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -0,0 +1,295 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.api.gax.core.CredentialsProvider; +import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.cloud.spring.core.DefaultCredentialsProvider; +import com.google.showcase.v1beta1.EchoClient; +import com.google.showcase.v1beta1.EchoSettings; +import java.io.IOException; +import javax.annotation.Generated; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.threeten.bp.Duration; + +@Generated("by gapic-generator-java") +@AutoConfiguration +@ConditionalOnClass(EchoClient.class) +@ConditionalOnProperty( + value = "spring.cloud.gcp.autoconfig.showcase.echo.enabled", + matchIfMissing = false) +@EnableConfigurationProperties(EchoSpringProperties.class) +public class EchoSpringAutoConfiguration { + private final EchoSpringProperties clientProperties; + + protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { + this.clientProperties = clientProperties; + } + + @Bean + @ConditionalOnMissingBean + public CredentialsProvider echoCredentials() throws IOException { + return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); + } + + @Bean + @ConditionalOnMissingBean + public TransportChannelProvider defaultEchoTransportChannelProvider() { + return EchoSettings.defaultTransportChannelProvider(); + } + + @Bean + @ConditionalOnMissingBean + public EchoClient echoClient( + @Qualifier("echoCredentials") CredentialsProvider credentialsProvider, + @Qualifier("defaultEchoTransportChannelProvider") + TransportChannelProvider defaultTransportChannelProvider) + throws IOException { + EchoSettings.Builder clientSettingsBuilder = + EchoSettings.newBuilder() + .setCredentialsProvider(credentialsProvider) + .setTransportChannelProvider(defaultTransportChannelProvider) + .setHeaderProvider(); + if (this.clientProperties.getQuotaProjectId() != null) { + clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + } + if (this.clientProperties.getExecutorThreadCount() != null) { + ExecutorProvider executorProvider = + EchoSettings.defaultExecutorProviderBuilder() + .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) + .build(); + clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + } + if (this.clientProperties.getUseRest()) { + clientSettingsBuilder.setTransportChannelProvider( + EchoSettings.defaultHttpJsonTransportProviderBuilder().build()); + } + RetrySettings.Builder echoRetrySettingBuilder = + clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getEchoInitialRetryDelay() != null) { + echoRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getEchoInitialRetryDelay()); + } + if (this.clientProperties.getEchoRetryDelayMultiplier() != null) { + echoRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getEchoRetryDelayMultiplier()); + } + if (this.clientProperties.getEchoMaxRetryDelay() != null) { + echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay()); + } + if (this.clientProperties.getEchoInitialRpcTimeout() != null) { + echoRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getEchoInitialRpcTimeout()); + } + if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) { + echoRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getEchoRpcTimeoutMultiplier()); + } + if (this.clientProperties.getEchoMaxRpcTimeout() != null) { + echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout()); + } + if (this.clientProperties.getEchoTotalTimeout() != null) { + echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout()); + } + clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build()); + RetrySettings.Builder expandRetrySettingBuilder = + clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getExpandInitialRetryDelay() != null) { + expandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getExpandInitialRetryDelay()); + } + if (this.clientProperties.getExpandRetryDelayMultiplier() != null) { + expandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getExpandMaxRetryDelay() != null) { + expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay()); + } + if (this.clientProperties.getExpandInitialRpcTimeout() != null) { + expandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getExpandInitialRpcTimeout()); + } + if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) { + expandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getExpandMaxRpcTimeout() != null) { + expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout()); + } + if (this.clientProperties.getExpandTotalTimeout() != null) { + expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout()); + } + clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build()); + RetrySettings.Builder collectRetrySettingBuilder = + clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollectInitialRpcTimeout() != null) { + collectRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollectInitialRpcTimeout()); + } + if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) { + collectRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollectRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollectMaxRpcTimeout() != null) { + collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout()); + } + if (this.clientProperties.getCollectTotalTimeout() != null) { + collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout()); + } + clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build()); + RetrySettings.Builder chatRetrySettingBuilder = + clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatInitialRpcTimeout() != null) { + chatRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatInitialRpcTimeout()); + } + if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) { + chatRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatMaxRpcTimeout() != null) { + chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout()); + } + if (this.clientProperties.getChatTotalTimeout() != null) { + chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout()); + } + clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build()); + RetrySettings.Builder chatAgainRetrySettingBuilder = + clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatAgainInitialRpcTimeout()); + } + if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) { + chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getChatAgainMaxRpcTimeout()); + } + if (this.clientProperties.getChatAgainTotalTimeout() != null) { + chatAgainRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getChatAgainTotalTimeout()); + } + clientSettingsBuilder + .chatAgainSettings() + .setRetrySettings(chatAgainRetrySettingBuilder.build()); + RetrySettings.Builder pagedExpandRetrySettingBuilder = + clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getPagedExpandInitialRetryDelay()); + } + if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getPagedExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setMaxRetryDelay( + this.clientProperties.getPagedExpandMaxRetryDelay()); + } + if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getPagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getPagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getPagedExpandTotalTimeout() != null) { + pagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getPagedExpandTotalTimeout()); + } + clientSettingsBuilder + .pagedExpandSettings() + .setRetrySettings(pagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder simplePagedExpandRetrySettingBuilder = + clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) { + simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getSimplePagedExpandTotalTimeout()); + } + clientSettingsBuilder + .simplePagedExpandSettings() + .setRetrySettings(simplePagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder waitRetrySettingBuilder = + clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getWaitInitialRpcTimeout() != null) { + waitRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getWaitInitialRpcTimeout()); + } + if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) { + waitRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getWaitRpcTimeoutMultiplier()); + } + if (this.clientProperties.getWaitMaxRpcTimeout() != null) { + waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout()); + } + if (this.clientProperties.getWaitTotalTimeout() != null) { + waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout()); + } + clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build()); + RetrySettings.Builder blockRetrySettingBuilder = + clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getBlockInitialRpcTimeout() != null) { + blockRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getBlockInitialRpcTimeout()); + } + if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) { + blockRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getBlockRpcTimeoutMultiplier()); + } + if (this.clientProperties.getBlockMaxRpcTimeout() != null) { + blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout()); + } + if (this.clientProperties.getBlockTotalTimeout() != null) { + blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout()); + } + clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build()); + RetrySettings.Builder collideNameRetrySettingBuilder = + clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) { + collideNameRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollideNameInitialRpcTimeout()); + } + if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) { + collideNameRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) { + collideNameRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getCollideNameMaxRpcTimeout()); + } + if (this.clientProperties.getCollideNameTotalTimeout() != null) { + collideNameRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getCollideNameTotalTimeout()); + } + clientSettingsBuilder + .collideNameSettings() + .setRetrySettings(collideNameRetrySettingBuilder.build()); + return EchoClient.create(clientSettingsBuilder.build()); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden new file mode 100644 index 0000000000..b884307ddc --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -0,0 +1,311 @@ +/* + * 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 + * + * https://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.showcase.v1beta1.spring; + +import com.google.api.gax.core.CredentialsProvider; +import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.cloud.spring.core.DefaultCredentialsProvider; +import com.google.showcase.v1beta1.EchoClient; +import com.google.showcase.v1beta1.EchoSettings; +import java.io.IOException; +import javax.annotation.Generated; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.threeten.bp.Duration; + +@Generated("by gapic-generator-java") +@AutoConfiguration +@ConditionalOnClass(EchoClient.class) +@ConditionalOnProperty( + value = "spring.cloud.gcp.autoconfig.showcase.echo.enabled", + matchIfMissing = false) +@EnableConfigurationProperties(EchoSpringProperties.class) +public class EchoSpringAutoConfiguration { + private final EchoSpringProperties clientProperties; + + protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { + this.clientProperties = clientProperties; + } + + @Bean + @ConditionalOnMissingBean + public CredentialsProvider echoCredentials() throws IOException { + return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); + } + + @Bean + @ConditionalOnMissingBean + public TransportChannelProvider defaultEchoTransportChannelProvider() { + return EchoSettings.defaultTransportChannelProvider(); + } + + @Bean + @ConditionalOnMissingBean + public EchoClient echoClient( + @Qualifier("echoCredentials") CredentialsProvider credentialsProvider, + @Qualifier("defaultEchoTransportChannelProvider") + TransportChannelProvider defaultTransportChannelProvider) + throws IOException { + EchoSettings.Builder clientSettingsBuilder = + EchoSettings.newBuilder() + .setCredentialsProvider(credentialsProvider) + .setTransportChannelProvider(defaultTransportChannelProvider) + .setHeaderProvider(); + if (this.clientProperties.getQuotaProjectId() != null) { + clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + } + if (this.clientProperties.getExecutorThreadCount() != null) { + ExecutorProvider executorProvider = + EchoSettings.defaultExecutorProviderBuilder() + .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) + .build(); + clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + } + if (this.clientProperties.getUseRest()) { + clientSettingsBuilder.setTransportChannelProvider( + EchoSettings.defaultHttpJsonTransportProviderBuilder().build()); + } + RetrySettings.Builder echoRetrySettingBuilder = + clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getEchoInitialRetryDelay() != null) { + echoRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getEchoInitialRetryDelay()); + } + if (this.clientProperties.getEchoRetryDelayMultiplier() != null) { + echoRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getEchoRetryDelayMultiplier()); + } + if (this.clientProperties.getEchoMaxRetryDelay() != null) { + echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay()); + } + if (this.clientProperties.getEchoInitialRpcTimeout() != null) { + echoRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getEchoInitialRpcTimeout()); + } + if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) { + echoRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getEchoRpcTimeoutMultiplier()); + } + if (this.clientProperties.getEchoMaxRpcTimeout() != null) { + echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout()); + } + if (this.clientProperties.getEchoTotalTimeout() != null) { + echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout()); + } + clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build()); + RetrySettings.Builder expandRetrySettingBuilder = + clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getExpandInitialRetryDelay() != null) { + expandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getExpandInitialRetryDelay()); + } + if (this.clientProperties.getExpandRetryDelayMultiplier() != null) { + expandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getExpandMaxRetryDelay() != null) { + expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay()); + } + if (this.clientProperties.getExpandInitialRpcTimeout() != null) { + expandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getExpandInitialRpcTimeout()); + } + if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) { + expandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getExpandMaxRpcTimeout() != null) { + expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout()); + } + if (this.clientProperties.getExpandTotalTimeout() != null) { + expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout()); + } + clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build()); + RetrySettings.Builder collectRetrySettingBuilder = + clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollectInitialRpcTimeout() != null) { + collectRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollectInitialRpcTimeout()); + } + if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) { + collectRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollectRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollectMaxRpcTimeout() != null) { + collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout()); + } + if (this.clientProperties.getCollectTotalTimeout() != null) { + collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout()); + } + clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build()); + RetrySettings.Builder chatRetrySettingBuilder = + clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatInitialRpcTimeout() != null) { + chatRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatInitialRpcTimeout()); + } + if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) { + chatRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatMaxRpcTimeout() != null) { + chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout()); + } + if (this.clientProperties.getChatTotalTimeout() != null) { + chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout()); + } + clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build()); + RetrySettings.Builder chatAgainRetrySettingBuilder = + clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatAgainInitialRpcTimeout()); + } + if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) { + chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getChatAgainMaxRpcTimeout()); + } + if (this.clientProperties.getChatAgainTotalTimeout() != null) { + chatAgainRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getChatAgainTotalTimeout()); + } + clientSettingsBuilder + .chatAgainSettings() + .setRetrySettings(chatAgainRetrySettingBuilder.build()); + RetrySettings.Builder pagedExpandRetrySettingBuilder = + clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getPagedExpandInitialRetryDelay()); + } + if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getPagedExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setMaxRetryDelay( + this.clientProperties.getPagedExpandMaxRetryDelay()); + } + if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getPagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getPagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getPagedExpandTotalTimeout() != null) { + pagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getPagedExpandTotalTimeout()); + } + clientSettingsBuilder + .pagedExpandSettings() + .setRetrySettings(pagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder simplePagedExpandRetrySettingBuilder = + clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) { + simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getSimplePagedExpandTotalTimeout()); + } + clientSettingsBuilder + .simplePagedExpandSettings() + .setRetrySettings(simplePagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder waitRetrySettingBuilder = + clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getWaitInitialRpcTimeout() != null) { + waitRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getWaitInitialRpcTimeout()); + } + if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) { + waitRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getWaitRpcTimeoutMultiplier()); + } + if (this.clientProperties.getWaitMaxRpcTimeout() != null) { + waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout()); + } + if (this.clientProperties.getWaitTotalTimeout() != null) { + waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout()); + } + clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build()); + RetrySettings.Builder blockRetrySettingBuilder = + clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getBlockInitialRpcTimeout() != null) { + blockRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getBlockInitialRpcTimeout()); + } + if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) { + blockRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getBlockRpcTimeoutMultiplier()); + } + if (this.clientProperties.getBlockMaxRpcTimeout() != null) { + blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout()); + } + if (this.clientProperties.getBlockTotalTimeout() != null) { + blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout()); + } + clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build()); + RetrySettings.Builder collideNameRetrySettingBuilder = + clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) { + collideNameRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollideNameInitialRpcTimeout()); + } + if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) { + collideNameRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) { + collideNameRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getCollideNameMaxRpcTimeout()); + } + if (this.clientProperties.getCollideNameTotalTimeout() != null) { + collideNameRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getCollideNameTotalTimeout()); + } + clientSettingsBuilder + .collideNameSettings() + .setRetrySettings(collideNameRetrySettingBuilder.build()); + return EchoClient.create(clientSettingsBuilder.build()); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden new file mode 100644 index 0000000000..2d4e9bcf76 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -0,0 +1,484 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.CredentialsSupplier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.threeten.bp.Duration; + +@ConfigurationProperties("spring.cloud.gcp.autoconfig.showcase.echo") +public class EchoSpringProperties implements CredentialsSupplier { + @NestedConfigurationProperty + private final Credentials credentials = + new Credentials("https://www.googleapis.com/auth/cloud-platform"); + + private String quotaProjectId; + private Integer executorThreadCount; + private boolean useRest; + private Duration echoInitialRetryDelay; + private Double echoRetryDelayMultiplier; + private Duration echoMaxRetryDelay; + private Duration echoInitialRpcTimeout; + private Double echoRpcTimeoutMultiplier; + private Duration echoMaxRpcTimeout; + private Duration echoTotalTimeout; + private Duration expandInitialRetryDelay; + private Double expandRetryDelayMultiplier; + private Duration expandMaxRetryDelay; + private Duration expandInitialRpcTimeout; + private Double expandRpcTimeoutMultiplier; + private Duration expandMaxRpcTimeout; + private Duration expandTotalTimeout; + private Duration collectInitialRpcTimeout; + private Double collectRpcTimeoutMultiplier; + private Duration collectMaxRpcTimeout; + private Duration collectTotalTimeout; + private Duration chatInitialRpcTimeout; + private Double chatRpcTimeoutMultiplier; + private Duration chatMaxRpcTimeout; + private Duration chatTotalTimeout; + private Duration chatAgainInitialRpcTimeout; + private Double chatAgainRpcTimeoutMultiplier; + private Duration chatAgainMaxRpcTimeout; + private Duration chatAgainTotalTimeout; + private Duration pagedExpandInitialRetryDelay; + private Double pagedExpandRetryDelayMultiplier; + private Duration pagedExpandMaxRetryDelay; + private Duration pagedExpandInitialRpcTimeout; + private Double pagedExpandRpcTimeoutMultiplier; + private Duration pagedExpandMaxRpcTimeout; + private Duration pagedExpandTotalTimeout; + private Duration simplePagedExpandInitialRpcTimeout; + private Double simplePagedExpandRpcTimeoutMultiplier; + private Duration simplePagedExpandMaxRpcTimeout; + private Duration simplePagedExpandTotalTimeout; + private Duration waitInitialRpcTimeout; + private Double waitRpcTimeoutMultiplier; + private Duration waitMaxRpcTimeout; + private Duration waitTotalTimeout; + private Duration blockInitialRpcTimeout; + private Double blockRpcTimeoutMultiplier; + private Duration blockMaxRpcTimeout; + private Duration blockTotalTimeout; + private Duration collideNameInitialRpcTimeout; + private Double collideNameRpcTimeoutMultiplier; + private Duration collideNameMaxRpcTimeout; + private Duration collideNameTotalTimeout; + + @Override + public Credentials getCredentials() { + return this.credentials; + } + + public String getQuotaProjectId() { + return this.quotaProjectId; + } + + public void setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; + } + + public boolean getUseRest() { + return this.useRest; + } + + public Integer getExecutorThreadCount() { + return this.executorThreadCount; + } + + public void setExecutorThreadCount(Integer executorThreadCount) { + this.executorThreadCount = executorThreadCount; + } + + public Duration getEchoInitialRetryDelay() { + return this.echoInitialRetryDelay; + } + + public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = echoInitialRetryDelay; + } + + public Double getEchoRetryDelayMultiplier() { + return this.echoRetryDelayMultiplier; + } + + public void setEchoRetryDelayMultiplier(Double echoRetryDelayMultiplier) { + this.echoRetryDelayMultiplier = echoRetryDelayMultiplier; + } + + public Duration getEchoMaxRetryDelay() { + return this.echoMaxRetryDelay; + } + + public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = echoMaxRetryDelay; + } + + public Duration getEchoInitialRpcTimeout() { + return this.echoInitialRpcTimeout; + } + + public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = echoInitialRpcTimeout; + } + + public Double getEchoRpcTimeoutMultiplier() { + return this.echoRpcTimeoutMultiplier; + } + + public void setEchoRpcTimeoutMultiplier(Double echoRpcTimeoutMultiplier) { + this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier; + } + + public Duration getEchoMaxRpcTimeout() { + return this.echoMaxRpcTimeout; + } + + public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = echoMaxRpcTimeout; + } + + public Duration getEchoTotalTimeout() { + return this.echoTotalTimeout; + } + + public void setEchoTotalTimeout(Duration echoTotalTimeout) { + this.echoTotalTimeout = echoTotalTimeout; + } + + public Duration getExpandInitialRetryDelay() { + return this.expandInitialRetryDelay; + } + + public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = expandInitialRetryDelay; + } + + public Double getExpandRetryDelayMultiplier() { + return this.expandRetryDelayMultiplier; + } + + public void setExpandRetryDelayMultiplier(Double expandRetryDelayMultiplier) { + this.expandRetryDelayMultiplier = expandRetryDelayMultiplier; + } + + public Duration getExpandMaxRetryDelay() { + return this.expandMaxRetryDelay; + } + + public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = expandMaxRetryDelay; + } + + public Duration getExpandInitialRpcTimeout() { + return this.expandInitialRpcTimeout; + } + + public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = expandInitialRpcTimeout; + } + + public Double getExpandRpcTimeoutMultiplier() { + return this.expandRpcTimeoutMultiplier; + } + + public void setExpandRpcTimeoutMultiplier(Double expandRpcTimeoutMultiplier) { + this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier; + } + + public Duration getExpandMaxRpcTimeout() { + return this.expandMaxRpcTimeout; + } + + public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = expandMaxRpcTimeout; + } + + public Duration getExpandTotalTimeout() { + return this.expandTotalTimeout; + } + + public void setExpandTotalTimeout(Duration expandTotalTimeout) { + this.expandTotalTimeout = expandTotalTimeout; + } + + public Duration getCollectInitialRpcTimeout() { + return this.collectInitialRpcTimeout; + } + + public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = collectInitialRpcTimeout; + } + + public Double getCollectRpcTimeoutMultiplier() { + return this.collectRpcTimeoutMultiplier; + } + + public void setCollectRpcTimeoutMultiplier(Double collectRpcTimeoutMultiplier) { + this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier; + } + + public Duration getCollectMaxRpcTimeout() { + return this.collectMaxRpcTimeout; + } + + public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = collectMaxRpcTimeout; + } + + public Duration getCollectTotalTimeout() { + return this.collectTotalTimeout; + } + + public void setCollectTotalTimeout(Duration collectTotalTimeout) { + this.collectTotalTimeout = collectTotalTimeout; + } + + public Duration getChatInitialRpcTimeout() { + return this.chatInitialRpcTimeout; + } + + public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = chatInitialRpcTimeout; + } + + public Double getChatRpcTimeoutMultiplier() { + return this.chatRpcTimeoutMultiplier; + } + + public void setChatRpcTimeoutMultiplier(Double chatRpcTimeoutMultiplier) { + this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier; + } + + public Duration getChatMaxRpcTimeout() { + return this.chatMaxRpcTimeout; + } + + public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = chatMaxRpcTimeout; + } + + public Duration getChatTotalTimeout() { + return this.chatTotalTimeout; + } + + public void setChatTotalTimeout(Duration chatTotalTimeout) { + this.chatTotalTimeout = chatTotalTimeout; + } + + public Duration getChatAgainInitialRpcTimeout() { + return this.chatAgainInitialRpcTimeout; + } + + public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + } + + public Double getChatAgainRpcTimeoutMultiplier() { + return this.chatAgainRpcTimeoutMultiplier; + } + + public void setChatAgainRpcTimeoutMultiplier(Double chatAgainRpcTimeoutMultiplier) { + this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier; + } + + public Duration getChatAgainMaxRpcTimeout() { + return this.chatAgainMaxRpcTimeout; + } + + public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + } + + public Duration getChatAgainTotalTimeout() { + return this.chatAgainTotalTimeout; + } + + public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = chatAgainTotalTimeout; + } + + public Duration getPagedExpandInitialRetryDelay() { + return this.pagedExpandInitialRetryDelay; + } + + public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + } + + public Double getPagedExpandRetryDelayMultiplier() { + return this.pagedExpandRetryDelayMultiplier; + } + + public void setPagedExpandRetryDelayMultiplier(Double pagedExpandRetryDelayMultiplier) { + this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier; + } + + public Duration getPagedExpandMaxRetryDelay() { + return this.pagedExpandMaxRetryDelay; + } + + public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + } + + public Duration getPagedExpandInitialRpcTimeout() { + return this.pagedExpandInitialRpcTimeout; + } + + public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + } + + public Double getPagedExpandRpcTimeoutMultiplier() { + return this.pagedExpandRpcTimeoutMultiplier; + } + + public void setPagedExpandRpcTimeoutMultiplier(Double pagedExpandRpcTimeoutMultiplier) { + this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier; + } + + public Duration getPagedExpandMaxRpcTimeout() { + return this.pagedExpandMaxRpcTimeout; + } + + public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + } + + public Duration getPagedExpandTotalTimeout() { + return this.pagedExpandTotalTimeout; + } + + public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + } + + public Duration getSimplePagedExpandInitialRpcTimeout() { + return this.simplePagedExpandInitialRpcTimeout; + } + + public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + } + + public Double getSimplePagedExpandRpcTimeoutMultiplier() { + return this.simplePagedExpandRpcTimeoutMultiplier; + } + + public void setSimplePagedExpandRpcTimeoutMultiplier( + Double simplePagedExpandRpcTimeoutMultiplier) { + this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier; + } + + public Duration getSimplePagedExpandMaxRpcTimeout() { + return this.simplePagedExpandMaxRpcTimeout; + } + + public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + } + + public Duration getSimplePagedExpandTotalTimeout() { + return this.simplePagedExpandTotalTimeout; + } + + public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + } + + public Duration getWaitInitialRpcTimeout() { + return this.waitInitialRpcTimeout; + } + + public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = waitInitialRpcTimeout; + } + + public Double getWaitRpcTimeoutMultiplier() { + return this.waitRpcTimeoutMultiplier; + } + + public void setWaitRpcTimeoutMultiplier(Double waitRpcTimeoutMultiplier) { + this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier; + } + + public Duration getWaitMaxRpcTimeout() { + return this.waitMaxRpcTimeout; + } + + public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = waitMaxRpcTimeout; + } + + public Duration getWaitTotalTimeout() { + return this.waitTotalTimeout; + } + + public void setWaitTotalTimeout(Duration waitTotalTimeout) { + this.waitTotalTimeout = waitTotalTimeout; + } + + public Duration getBlockInitialRpcTimeout() { + return this.blockInitialRpcTimeout; + } + + public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = blockInitialRpcTimeout; + } + + public Double getBlockRpcTimeoutMultiplier() { + return this.blockRpcTimeoutMultiplier; + } + + public void setBlockRpcTimeoutMultiplier(Double blockRpcTimeoutMultiplier) { + this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier; + } + + public Duration getBlockMaxRpcTimeout() { + return this.blockMaxRpcTimeout; + } + + public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = blockMaxRpcTimeout; + } + + public Duration getBlockTotalTimeout() { + return this.blockTotalTimeout; + } + + public void setBlockTotalTimeout(Duration blockTotalTimeout) { + this.blockTotalTimeout = blockTotalTimeout; + } + + public Duration getCollideNameInitialRpcTimeout() { + return this.collideNameInitialRpcTimeout; + } + + public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + } + + public Double getCollideNameRpcTimeoutMultiplier() { + return this.collideNameRpcTimeoutMultiplier; + } + + public void setCollideNameRpcTimeoutMultiplier(Double collideNameRpcTimeoutMultiplier) { + this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier; + } + + public Duration getCollideNameMaxRpcTimeout() { + return this.collideNameMaxRpcTimeout; + } + + public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + } + + public Duration getCollideNameTotalTimeout() { + return this.collideNameTotalTimeout; + } + + public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = collideNameTotalTimeout; + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden new file mode 100644 index 0000000000..302edc60b2 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -0,0 +1,500 @@ +/* + * 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 + * + * https://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.showcase.v1beta1.spring; + +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.CredentialsSupplier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.threeten.bp.Duration; + +@ConfigurationProperties("spring.cloud.gcp.autoconfig.showcase.echo") +public class EchoSpringProperties implements CredentialsSupplier { + @NestedConfigurationProperty + private final Credentials credentials = + new Credentials("https://www.googleapis.com/auth/cloud-platform"); + + private String quotaProjectId; + private Integer executorThreadCount; + private boolean useRest; + private Duration echoInitialRetryDelay; + private Double echoRetryDelayMultiplier; + private Duration echoMaxRetryDelay; + private Duration echoInitialRpcTimeout; + private Double echoRpcTimeoutMultiplier; + private Duration echoMaxRpcTimeout; + private Duration echoTotalTimeout; + private Duration expandInitialRetryDelay; + private Double expandRetryDelayMultiplier; + private Duration expandMaxRetryDelay; + private Duration expandInitialRpcTimeout; + private Double expandRpcTimeoutMultiplier; + private Duration expandMaxRpcTimeout; + private Duration expandTotalTimeout; + private Duration collectInitialRpcTimeout; + private Double collectRpcTimeoutMultiplier; + private Duration collectMaxRpcTimeout; + private Duration collectTotalTimeout; + private Duration chatInitialRpcTimeout; + private Double chatRpcTimeoutMultiplier; + private Duration chatMaxRpcTimeout; + private Duration chatTotalTimeout; + private Duration chatAgainInitialRpcTimeout; + private Double chatAgainRpcTimeoutMultiplier; + private Duration chatAgainMaxRpcTimeout; + private Duration chatAgainTotalTimeout; + private Duration pagedExpandInitialRetryDelay; + private Double pagedExpandRetryDelayMultiplier; + private Duration pagedExpandMaxRetryDelay; + private Duration pagedExpandInitialRpcTimeout; + private Double pagedExpandRpcTimeoutMultiplier; + private Duration pagedExpandMaxRpcTimeout; + private Duration pagedExpandTotalTimeout; + private Duration simplePagedExpandInitialRpcTimeout; + private Double simplePagedExpandRpcTimeoutMultiplier; + private Duration simplePagedExpandMaxRpcTimeout; + private Duration simplePagedExpandTotalTimeout; + private Duration waitInitialRpcTimeout; + private Double waitRpcTimeoutMultiplier; + private Duration waitMaxRpcTimeout; + private Duration waitTotalTimeout; + private Duration blockInitialRpcTimeout; + private Double blockRpcTimeoutMultiplier; + private Duration blockMaxRpcTimeout; + private Duration blockTotalTimeout; + private Duration collideNameInitialRpcTimeout; + private Double collideNameRpcTimeoutMultiplier; + private Duration collideNameMaxRpcTimeout; + private Duration collideNameTotalTimeout; + + @Override + public Credentials getCredentials() { + return this.credentials; + } + + public String getQuotaProjectId() { + return this.quotaProjectId; + } + + public void setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; + } + + public boolean getUseRest() { + return this.useRest; + } + + public Integer getExecutorThreadCount() { + return this.executorThreadCount; + } + + public void setExecutorThreadCount(Integer executorThreadCount) { + this.executorThreadCount = executorThreadCount; + } + + public Duration getEchoInitialRetryDelay() { + return this.echoInitialRetryDelay; + } + + public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = echoInitialRetryDelay; + } + + public Double getEchoRetryDelayMultiplier() { + return this.echoRetryDelayMultiplier; + } + + public void setEchoRetryDelayMultiplier(Double echoRetryDelayMultiplier) { + this.echoRetryDelayMultiplier = echoRetryDelayMultiplier; + } + + public Duration getEchoMaxRetryDelay() { + return this.echoMaxRetryDelay; + } + + public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = echoMaxRetryDelay; + } + + public Duration getEchoInitialRpcTimeout() { + return this.echoInitialRpcTimeout; + } + + public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = echoInitialRpcTimeout; + } + + public Double getEchoRpcTimeoutMultiplier() { + return this.echoRpcTimeoutMultiplier; + } + + public void setEchoRpcTimeoutMultiplier(Double echoRpcTimeoutMultiplier) { + this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier; + } + + public Duration getEchoMaxRpcTimeout() { + return this.echoMaxRpcTimeout; + } + + public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = echoMaxRpcTimeout; + } + + public Duration getEchoTotalTimeout() { + return this.echoTotalTimeout; + } + + public void setEchoTotalTimeout(Duration echoTotalTimeout) { + this.echoTotalTimeout = echoTotalTimeout; + } + + public Duration getExpandInitialRetryDelay() { + return this.expandInitialRetryDelay; + } + + public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = expandInitialRetryDelay; + } + + public Double getExpandRetryDelayMultiplier() { + return this.expandRetryDelayMultiplier; + } + + public void setExpandRetryDelayMultiplier(Double expandRetryDelayMultiplier) { + this.expandRetryDelayMultiplier = expandRetryDelayMultiplier; + } + + public Duration getExpandMaxRetryDelay() { + return this.expandMaxRetryDelay; + } + + public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = expandMaxRetryDelay; + } + + public Duration getExpandInitialRpcTimeout() { + return this.expandInitialRpcTimeout; + } + + public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = expandInitialRpcTimeout; + } + + public Double getExpandRpcTimeoutMultiplier() { + return this.expandRpcTimeoutMultiplier; + } + + public void setExpandRpcTimeoutMultiplier(Double expandRpcTimeoutMultiplier) { + this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier; + } + + public Duration getExpandMaxRpcTimeout() { + return this.expandMaxRpcTimeout; + } + + public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = expandMaxRpcTimeout; + } + + public Duration getExpandTotalTimeout() { + return this.expandTotalTimeout; + } + + public void setExpandTotalTimeout(Duration expandTotalTimeout) { + this.expandTotalTimeout = expandTotalTimeout; + } + + public Duration getCollectInitialRpcTimeout() { + return this.collectInitialRpcTimeout; + } + + public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = collectInitialRpcTimeout; + } + + public Double getCollectRpcTimeoutMultiplier() { + return this.collectRpcTimeoutMultiplier; + } + + public void setCollectRpcTimeoutMultiplier(Double collectRpcTimeoutMultiplier) { + this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier; + } + + public Duration getCollectMaxRpcTimeout() { + return this.collectMaxRpcTimeout; + } + + public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = collectMaxRpcTimeout; + } + + public Duration getCollectTotalTimeout() { + return this.collectTotalTimeout; + } + + public void setCollectTotalTimeout(Duration collectTotalTimeout) { + this.collectTotalTimeout = collectTotalTimeout; + } + + public Duration getChatInitialRpcTimeout() { + return this.chatInitialRpcTimeout; + } + + public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = chatInitialRpcTimeout; + } + + public Double getChatRpcTimeoutMultiplier() { + return this.chatRpcTimeoutMultiplier; + } + + public void setChatRpcTimeoutMultiplier(Double chatRpcTimeoutMultiplier) { + this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier; + } + + public Duration getChatMaxRpcTimeout() { + return this.chatMaxRpcTimeout; + } + + public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = chatMaxRpcTimeout; + } + + public Duration getChatTotalTimeout() { + return this.chatTotalTimeout; + } + + public void setChatTotalTimeout(Duration chatTotalTimeout) { + this.chatTotalTimeout = chatTotalTimeout; + } + + public Duration getChatAgainInitialRpcTimeout() { + return this.chatAgainInitialRpcTimeout; + } + + public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + } + + public Double getChatAgainRpcTimeoutMultiplier() { + return this.chatAgainRpcTimeoutMultiplier; + } + + public void setChatAgainRpcTimeoutMultiplier(Double chatAgainRpcTimeoutMultiplier) { + this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier; + } + + public Duration getChatAgainMaxRpcTimeout() { + return this.chatAgainMaxRpcTimeout; + } + + public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + } + + public Duration getChatAgainTotalTimeout() { + return this.chatAgainTotalTimeout; + } + + public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = chatAgainTotalTimeout; + } + + public Duration getPagedExpandInitialRetryDelay() { + return this.pagedExpandInitialRetryDelay; + } + + public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + } + + public Double getPagedExpandRetryDelayMultiplier() { + return this.pagedExpandRetryDelayMultiplier; + } + + public void setPagedExpandRetryDelayMultiplier(Double pagedExpandRetryDelayMultiplier) { + this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier; + } + + public Duration getPagedExpandMaxRetryDelay() { + return this.pagedExpandMaxRetryDelay; + } + + public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + } + + public Duration getPagedExpandInitialRpcTimeout() { + return this.pagedExpandInitialRpcTimeout; + } + + public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + } + + public Double getPagedExpandRpcTimeoutMultiplier() { + return this.pagedExpandRpcTimeoutMultiplier; + } + + public void setPagedExpandRpcTimeoutMultiplier(Double pagedExpandRpcTimeoutMultiplier) { + this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier; + } + + public Duration getPagedExpandMaxRpcTimeout() { + return this.pagedExpandMaxRpcTimeout; + } + + public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + } + + public Duration getPagedExpandTotalTimeout() { + return this.pagedExpandTotalTimeout; + } + + public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + } + + public Duration getSimplePagedExpandInitialRpcTimeout() { + return this.simplePagedExpandInitialRpcTimeout; + } + + public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + } + + public Double getSimplePagedExpandRpcTimeoutMultiplier() { + return this.simplePagedExpandRpcTimeoutMultiplier; + } + + public void setSimplePagedExpandRpcTimeoutMultiplier( + Double simplePagedExpandRpcTimeoutMultiplier) { + this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier; + } + + public Duration getSimplePagedExpandMaxRpcTimeout() { + return this.simplePagedExpandMaxRpcTimeout; + } + + public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + } + + public Duration getSimplePagedExpandTotalTimeout() { + return this.simplePagedExpandTotalTimeout; + } + + public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + } + + public Duration getWaitInitialRpcTimeout() { + return this.waitInitialRpcTimeout; + } + + public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = waitInitialRpcTimeout; + } + + public Double getWaitRpcTimeoutMultiplier() { + return this.waitRpcTimeoutMultiplier; + } + + public void setWaitRpcTimeoutMultiplier(Double waitRpcTimeoutMultiplier) { + this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier; + } + + public Duration getWaitMaxRpcTimeout() { + return this.waitMaxRpcTimeout; + } + + public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = waitMaxRpcTimeout; + } + + public Duration getWaitTotalTimeout() { + return this.waitTotalTimeout; + } + + public void setWaitTotalTimeout(Duration waitTotalTimeout) { + this.waitTotalTimeout = waitTotalTimeout; + } + + public Duration getBlockInitialRpcTimeout() { + return this.blockInitialRpcTimeout; + } + + public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = blockInitialRpcTimeout; + } + + public Double getBlockRpcTimeoutMultiplier() { + return this.blockRpcTimeoutMultiplier; + } + + public void setBlockRpcTimeoutMultiplier(Double blockRpcTimeoutMultiplier) { + this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier; + } + + public Duration getBlockMaxRpcTimeout() { + return this.blockMaxRpcTimeout; + } + + public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = blockMaxRpcTimeout; + } + + public Duration getBlockTotalTimeout() { + return this.blockTotalTimeout; + } + + public void setBlockTotalTimeout(Duration blockTotalTimeout) { + this.blockTotalTimeout = blockTotalTimeout; + } + + public Duration getCollideNameInitialRpcTimeout() { + return this.collideNameInitialRpcTimeout; + } + + public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + } + + public Double getCollideNameRpcTimeoutMultiplier() { + return this.collideNameRpcTimeoutMultiplier; + } + + public void setCollideNameRpcTimeoutMultiplier(Double collideNameRpcTimeoutMultiplier) { + this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier; + } + + public Duration getCollideNameMaxRpcTimeout() { + return this.collideNameMaxRpcTimeout; + } + + public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + } + + public Duration getCollideNameTotalTimeout() { + return this.collideNameTotalTimeout; + } + + public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = collideNameTotalTimeout; + } +} From 07dfa79ad93cc40067e39fb5e7c12c162601af14 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Tue, 18 Oct 2022 10:37:11 -0400 Subject: [PATCH 041/103] fix(Spring CodeGen): Update and move naming-related logic into utils (#1061) Updates and moves three pieces of naming-related logic in spring codegen into util methods: * getSpringPropertyPrefix (e.g. com.google.cloud.vision.v1.spring.auto.image-annotator): Replaced earlier use of libname due to ambiguity * getLibName (e.g. vision): Intended for descriptive purposes; Includes three options considered by design doc - currently implements option 2 (parse from package name) with the intention to switch to option 3 (parse from default host) in alignment with SampleGen * getSpringPackageName (e.g. com.google.cloud.vision.v1.spring): Since this was also used in a couple of places, extracted to util in case of future need to update --- .../api/generator/spring/SpringWriter.java | 6 +-- .../SpringAutoConfigClassComposer.java | 13 +++--- .../SpringPropertiesClassComposer.java | 4 +- .../api/generator/spring/composer/Utils.java | 46 ++++++++++++++++--- .../EchoSpringAutoConfiguration.golden | 2 +- .../EchoSpringAutoConfigurationFull.golden | 2 +- .../goldens/EchoSpringProperties.golden | 2 +- .../goldens/EchoSpringPropertiesFull.golden | 2 +- 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 7bf3ef1613..d88229afad 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -163,7 +163,6 @@ private static void writeSpringAdditionalMetadataJson(GapicContext context, JarO String path = "src/main/resources/META-INF"; JarEntry jarEntry = new JarEntry(String.format("%s/additional-spring-configuration-metadata.json", path)); - String libName = Utils.getLibName(context); try { jos.putNextEntry(jarEntry); StringJoiner sb = new StringJoiner(",\n", "\n{\n \"properties\": [\n", "\n ]\n" + "}"); @@ -179,8 +178,9 @@ private static void writeSpringAdditionalMetadataJson(GapicContext context, JarO + " \"description\": \"Auto-configure Google Cloud %s components.\",\n" + " \"defaultValue\": true\n" + " }", - Utils.springPropertyPrefix(libName, service.name()), - libName + "/" + service.name()))); + Utils.getSpringPropertyPrefix( + Utils.getPackageName(context), service.name()), + Utils.getLibName(context) + "/" + service.name()))); jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index b9cf9f8712..b9ea62830d 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -79,12 +79,11 @@ public static SpringAutoConfigClassComposer instance() { @Override public GapicClass generate(GapicContext context, Service service) { - String packageName = service.pakkage() + ".spring"; + String packageName = Utils.getSpringPackageName(service.pakkage()); Map types = createDynamicTypes(service, packageName); String serviceName = service.name(); String serviceNameLowerCamel = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); String className = getThisClassName(serviceName); - String libName = Utils.getLibName(context); String credentialsProviderName = serviceNameLowerCamel + "Credentials"; String transportChannelProviderName = "default" + serviceName + "TransportChannelProvider"; String clientName = serviceNameLowerCamel + "Client"; @@ -115,7 +114,7 @@ public GapicClass generate(GapicContext context, Service service) { clientName, types, gapicServiceConfig))) - .setAnnotations(createClassAnnotations(service, types, libName)) + .setAnnotations(createClassAnnotations(service, types)) .build(); return GapicClass.create(kind, classDef); } @@ -219,11 +218,12 @@ private static MethodDefinition createConstructor( } private static List createClassAnnotations( - Service service, Map types, String libName) { + Service service, Map types) { // @Generated("by gapic-generator-java") // @AutoConfiguration // @ConditionalOnClass(LanguageServiceClient.class) - // @ConditionalOnProperty(value = "spring.cloud.gcp.language.enabled", matchIfMissing = true) + // @ConditionalOnProperty(value = + // "com.google.cloud.language.v1.spring.auto.language-service.enabled", matchIfMissing = true) // @EnableConfigurationProperties(LanguageProperties.class) AssignmentExpr valueStringAssignmentExpr = @@ -234,7 +234,8 @@ private static List createClassAnnotations( .setValueExpr( ValueExpr.withValue( StringObjectValue.withValue( - Utils.springPropertyPrefix(libName, service.name()) + ".enabled"))) + Utils.getSpringPropertyPrefix(service.pakkage(), service.name()) + + ".enabled"))) .build(); AssignmentExpr matchIfMissingAssignmentExpr = AssignmentExpr.builder() diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index aff2bcbe2d..5f93156f72 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -64,7 +64,7 @@ public static SpringPropertiesClassComposer instance() { @Override public GapicClass generate(GapicContext context, Service service) { - String packageName = service.pakkage() + ".spring"; + String packageName = Utils.getSpringPackageName(service.pakkage()); String className = String.format(CLASS_NAME_PATTERN, service.name()); GapicServiceConfig gapicServiceConfig = context.serviceConfig(); Map types = createDynamicTypes(service, packageName); @@ -74,7 +74,7 @@ public GapicClass generate(GapicContext context, Service service) { AnnotationNode classAnnotationNode = AnnotationNode.builder() .setType(types.get("ConfigurationProperties")) - .setDescription(Utils.springPropertyPrefix(Utils.getLibName(context), service.name())) + .setDescription(Utils.getSpringPropertyPrefix(service.pakkage(), service.name())) .build(); ClassDefinition classDef = diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/composer/Utils.java index e8194a8f43..f568bbf5ef 100644 --- a/src/main/java/com/google/api/generator/spring/composer/Utils.java +++ b/src/main/java/com/google/api/generator/spring/composer/Utils.java @@ -44,18 +44,50 @@ public class Utils { private static final String BRAND_NAME = "spring.cloud.gcp"; public static String getLibName(GapicContext context) { - String pakkageName = context.services().get(0).pakkage(); - List pakkagePhrases = Splitter.on(".").splitToList(pakkageName); - // TODO: confirm if this is guaranteed pattern: xx.[...].xx.lib-name.v[version] + // Returns parsed name of client library + // This should only be used in descriptive context, such as metadata and javadocs + + // Option 1: Use title from service yaml if available (e.g. Client Library Showcase API) + // However, service yaml is optionally parsed and not always available + // if (context.hasServiceYamlProto() + // && !Strings.isNullOrEmpty(context.serviceYamlProto().getTitle())) { + // return context.serviceYamlProto().getTitle(); + // } + + // Option 2: Parse ApiShortName from service proto's package name (e.g. + // com.google.cloud.vision.v1) + // This approach assumes pattern of xx.[...].xx.lib-name.v[version], which may have + // discrepancies // eg. for vision proto: "com.google.cloud.vision.v1" // https://github.com/googleapis/java-vision/blob/main/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto#L36 + List pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context)); return pakkagePhrases.get(pakkagePhrases.size() - 2); + + // Option 3: Parse ApiShortName from service proto's default host (e.g. vision.googleapis.com) + // TODO: Replace implementation above to reuse parsing logic from SampleGen: + // https://github.com/googleapis/gapic-generator-java/pull/1040 + } + + public static String getPackageName(GapicContext context) { + // Returns package name of client library + return context.services().get(0).pakkage(); + } + + public static String getSpringPackageName(String packageName) { + // Returns package name of generated spring autoconfiguration library + // e.g. for vision: com.google.cloud.vision.v1.spring + return packageName + ".spring"; } - public static String springPropertyPrefix(String libName, String serviceName) { - return "spring.cloud.gcp.autoconfig." - + CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_HYPHEN, libName) - + "." + public static String getSpringPropertyPrefix(String packageName, String serviceName) { + // Returns unique prefix for setting properties and enabling autoconfiguration + // Pattern: [package-name].spring.auto.[service-name] + // e.g. for vision's ImageAnnotator service: + // com.google.cloud.vision.v1.spring.auto.image-annotator + // Service name is converted to lower hyphen as required by ConfigurationPropertyName + // https://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/context/properties/source/ConfigurationPropertyName.html + return packageName + + ".spring.auto." + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index f7ba93e7da..e85c82e9ac 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -22,7 +22,7 @@ import org.threeten.bp.Duration; @AutoConfiguration @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( - value = "spring.cloud.gcp.autoconfig.showcase.echo.enabled", + value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", matchIfMissing = false) @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index b884307ddc..2f227c825f 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -38,7 +38,7 @@ import org.threeten.bp.Duration; @AutoConfiguration @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( - value = "spring.cloud.gcp.autoconfig.showcase.echo.enabled", + value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", matchIfMissing = false) @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden index 2d4e9bcf76..5fe2406751 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -5,7 +5,7 @@ import com.google.cloud.spring.core.CredentialsSupplier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.threeten.bp.Duration; -@ConfigurationProperties("spring.cloud.gcp.autoconfig.showcase.echo") +@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty private final Credentials credentials = diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index 302edc60b2..a20c370430 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -21,7 +21,7 @@ import com.google.cloud.spring.core.CredentialsSupplier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.threeten.bp.Duration; -@ConfigurationProperties("spring.cloud.gcp.autoconfig.showcase.echo") +@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty private final Credentials credentials = From 1818d0b08ab236b02416bc240fb3f80409589aa3 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Sat, 22 Oct 2022 18:04:10 -0400 Subject: [PATCH 042/103] feat(log): added log statements to gend autocfg (#1053) * feat(log): added log statements to gend autocfg Added log statements and setup in autoconfig class. Some common methods were put in Util in case they have to be reused * fix(log): fixes from PR comments - added rest of logger statements (1 per if-statement) - used getExecutorThreadCount() to log number of threads - moved logging utils to its own class * fix(format): ran google_java_format * fix(test): updated goldens * fix: add license header to LoggerUtil --- .../api/generator/spring/SpringWriter.java | 2 +- .../SpringAutoConfigClassComposer.java | 48 +++++++- .../SpringPropertiesClassComposer.java | 1 + .../generator/spring/utils/LoggerUtils.java | 109 +++++++++++++++++ .../spring/{composer => utils}/Utils.java | 2 +- .../EchoSpringAutoConfiguration.golden | 110 ++++++++++++++++++ .../EchoSpringAutoConfigurationFull.golden | 110 ++++++++++++++++++ 7 files changed, 375 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java rename src/main/java/com/google/api/generator/spring/{composer => utils}/Utils.java (99%) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index d88229afad..67925a38bd 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -20,7 +20,7 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; -import com.google.api.generator.spring.composer.Utils; +import com.google.api.generator.spring.utils.Utils; import com.google.protobuf.ByteString; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import com.google.protobuf.util.JsonFormat; diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index b9ea62830d..cec37f1b75 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -19,6 +19,7 @@ import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.ArithmeticOperationExpr; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.CastExpr; import com.google.api.generator.engine.ast.ClassDefinition; @@ -47,6 +48,8 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.spring.utils.LoggerUtils; +import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; @@ -157,7 +160,9 @@ private static List createMemberVariables( .build(); ExprStatement clientPropertiesStatement = ExprStatement.withExpr(clientPropertiesVarExpr); - return Arrays.asList(clientPropertiesStatement); + Statement loggerStatement = + LoggerUtils.getLoggerDeclarationExpr(serviceName + "AutoConfig", types); + return Arrays.asList(clientPropertiesStatement, loggerStatement); } private static MethodDefinition createConstructor( @@ -559,10 +564,19 @@ private static MethodDefinition createClientBeanMethod( .setArguments(getQuotaProjectId) .build(); + ExprStatement projectIdLoggerStatement = + LoggerUtils.createLoggerStatement( + LoggerUtils.concatManyWithExprs( + ValueExpr.withValue(StringObjectValue.withValue("Quota project id set to ")), + getQuotaProjectId, + ValueExpr.withValue( + StringObjectValue.withValue(", this overrides project id from credentials."))), + types); + IfStatement setQuotaProjectIdStatement = createIfStatement( projectIdIsNull, - Arrays.asList(ExprStatement.withExpr(setQuotaProjectId)), // TODO add logger info + Arrays.asList(ExprStatement.withExpr(setQuotaProjectId), projectIdLoggerStatement), null); bodyStatements.add(setQuotaProjectIdStatement); @@ -621,12 +635,20 @@ private static MethodDefinition createClientBeanMethod( .setArguments(executorProviderVarExpr) .build(); + ExprStatement backgroundExecutorLoggerStatement = + LoggerUtils.createLoggerStatement( + ArithmeticOperationExpr.concatWithExprs( + ValueExpr.withValue( + StringObjectValue.withValue("Background executor thread count is ")), + getExecutorThreadCount), + types); IfStatement setBackgroundExecutorProviderStatement = createIfStatement( executorThreadCountIsNull, Arrays.asList( ExprStatement.withExpr(executorProviderAssignExpr), - ExprStatement.withExpr(setBackgroundExecutorProvider)), // TODO add logger info + ExprStatement.withExpr(setBackgroundExecutorProvider), + backgroundExecutorLoggerStatement), null); bodyStatements.add(setBackgroundExecutorProviderStatement); @@ -664,7 +686,14 @@ private static MethodDefinition createClientBeanMethod( .build(); IfStatement setTransportChannelProviderStatement = createIfStatement( - getUseRest, Arrays.asList(ExprStatement.withExpr(setTransportProvider)), null); + getUseRest, + Arrays.asList( + ExprStatement.withExpr(setTransportProvider), + LoggerUtils.createLoggerStatement( + ValueExpr.withValue( + StringObjectValue.withValue("Using HTTP transport channel")), + types)), + null); bodyStatements.add(setTransportChannelProviderStatement); @@ -721,7 +750,14 @@ private static MethodDefinition createClientBeanMethod( IfStatement currentRetrySettingPropertyIfStatement = createIfStatement( currentRetrySettingPropertyIsNull, - Arrays.asList(ExprStatement.withExpr(retrySettingsBuilderChain)), + Arrays.asList( + ExprStatement.withExpr(retrySettingsBuilderChain), + LoggerUtils.createLoggerStatement( + LoggerUtils.concatManyWithExprs( + ValueExpr.withValue( + StringObjectValue.withValue(propertyName + " set to ")), + currentRetrySettingProperty), + types)), null); statements.add(currentRetrySettingPropertyIfStatement); return statements; @@ -947,6 +983,8 @@ private static Map createDynamicTypes(Service service, String typeMap.put("ConditionalOnProperty", conditionalOnProperty); typeMap.put("ConditionalOnClass", conditionalOnClass); typeMap.put("Qualifier", qualifier); + typeMap.put("Log", LoggerUtils.getLoggerType()); + typeMap.put("LogFactory", LoggerUtils.getLoggerFactoryType()); return typeMap; } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 5f93156f72..00c1c3557f 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -41,6 +41,7 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; import java.util.ArrayList; diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java new file mode 100644 index 0000000000..31cce78ed2 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java @@ -0,0 +1,109 @@ +// 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.spring.utils; + +import com.google.api.generator.engine.ast.ArithmeticOperationExpr; +import com.google.api.generator.engine.ast.AssignmentExpr; +import com.google.api.generator.engine.ast.Expr; +import com.google.api.generator.engine.ast.ExprStatement; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.Statement; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.VaporReference; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +public class LoggerUtils { + + public static Statement getLoggerDeclarationExpr(String className, Map types) { + + Variable loggerVar = Variable.builder().setName("LOGGER").setType(types.get("Log")).build(); + VariableExpr loggerExpr = + VariableExpr.builder() + .setVariable(loggerVar) + .setScope(ScopeNode.PRIVATE) + .setIsStatic(true) + .setIsFinal(true) + .setIsDecl(true) + .build(); + + MethodInvocationExpr loggerValueExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(types.get("LogFactory")) + .setMethodName("getLog") + .setArguments( + VariableExpr.builder() + .setVariable( + Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build()) + .setStaticReferenceType(types.get(className)) + .build()) + .setReturnType(types.get("Log")) + .build(); + + AssignmentExpr loggerAssignmentExpr = + AssignmentExpr.builder().setVariableExpr(loggerExpr).setValueExpr(loggerValueExpr).build(); + + return ExprStatement.withExpr(loggerAssignmentExpr); + } + + public static ExprStatement createLoggerStatement(Expr value, Map types) { + Variable loggerVariable = + Variable.builder().setName("LOGGER").setType(types.get("Log")).build(); + MethodInvocationExpr loggerCallExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable)) + .setMethodName("info") + .setArguments(value) + .build(); + return ExprStatement.withExpr(loggerCallExpr); + } + + public static TypeNode getLoggerType() { + return createType("Log", "org.apache.commons.logging"); + } + + public static TypeNode getLoggerFactoryType() { + return createType("LogFactory", "org.apache.commons.logging"); + } + + private static TypeNode createType(String className, String pakkage) { + TypeNode loggerType = + TypeNode.withReference( + VaporReference.builder().setName(className).setPakkage(pakkage).build()); + return loggerType; + } + + public static Expr concatManyWithExprs(Expr... exprs) { + List exprList = Arrays.asList(exprs); + return concatManyWithExprsHelper(Optional.empty(), exprList); + } + + private static Expr concatManyWithExprsHelper(Optional current, List exprs) { + if (!current.isPresent()) { + return concatManyWithExprsHelper(Optional.of(exprs.get(0)), exprs.subList(1, exprs.size())); + } + if (exprs.size() == 1) { + return ArithmeticOperationExpr.concatWithExprs(current.get(), exprs.get(0)); + } + return ArithmeticOperationExpr.concatWithExprs( + current.get(), + concatManyWithExprsHelper(Optional.of(exprs.get(0)), exprs.subList(1, exprs.size()))); + } +} diff --git a/src/main/java/com/google/api/generator/spring/composer/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java similarity index 99% rename from src/main/java/com/google/api/generator/spring/composer/Utils.java rename to src/main/java/com/google/api/generator/spring/utils/Utils.java index f568bbf5ef..dea2b743f3 100644 --- a/src/main/java/com/google/api/generator/spring/composer/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.spring.composer; +package com.google.api.generator.spring.utils; import com.google.api.generator.engine.ast.AstNode; import com.google.api.generator.engine.ast.Expr; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index e85c82e9ac..be91d0f036 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -10,6 +10,8 @@ import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; import javax.annotation.Generated; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -27,6 +29,7 @@ import org.threeten.bp.Duration; @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { this.clientProperties = clientProperties; @@ -58,6 +61,10 @@ public class EchoSpringAutoConfiguration { .setHeaderProvider(); if (this.clientProperties.getQuotaProjectId() != null) { clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + LOGGER.info( + "Quota project id set to " + + this.clientProperties.getQuotaProjectId() + + ", this overrides project id from credentials."); } if (this.clientProperties.getExecutorThreadCount() != null) { ExecutorProvider executorProvider = @@ -65,37 +72,51 @@ public class EchoSpringAutoConfiguration { .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) .build(); clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + LOGGER.info( + "Background executor thread count is " + this.clientProperties.getExecutorThreadCount()); } if (this.clientProperties.getUseRest()) { clientSettingsBuilder.setTransportChannelProvider( EchoSettings.defaultHttpJsonTransportProviderBuilder().build()); + LOGGER.info("Using HTTP transport channel"); } RetrySettings.Builder echoRetrySettingBuilder = clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); if (this.clientProperties.getEchoInitialRetryDelay() != null) { echoRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getEchoInitialRetryDelay()); + LOGGER.info( + "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay()); } if (this.clientProperties.getEchoRetryDelayMultiplier() != null) { echoRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getEchoRetryDelayMultiplier()); + LOGGER.info( + "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier()); } if (this.clientProperties.getEchoMaxRetryDelay() != null) { echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay()); + LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay()); } if (this.clientProperties.getEchoInitialRpcTimeout() != null) { echoRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getEchoInitialRpcTimeout()); + LOGGER.info( + "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout()); } if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) { echoRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getEchoRpcTimeoutMultiplier()); + LOGGER.info( + "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier()); } if (this.clientProperties.getEchoMaxRpcTimeout() != null) { echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout()); + LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout()); } if (this.clientProperties.getEchoTotalTimeout() != null) { echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout()); + LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout()); } clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build()); RetrySettings.Builder expandRetrySettingBuilder = @@ -103,27 +124,40 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getExpandInitialRetryDelay() != null) { expandRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getExpandInitialRetryDelay()); + LOGGER.info( + "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay()); } if (this.clientProperties.getExpandRetryDelayMultiplier() != null) { expandRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getExpandRetryDelayMultiplier()); + LOGGER.info( + "ExpandRetryDelayMultiplier set to " + + this.clientProperties.getExpandRetryDelayMultiplier()); } if (this.clientProperties.getExpandMaxRetryDelay() != null) { expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay()); + LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay()); } if (this.clientProperties.getExpandInitialRpcTimeout() != null) { expandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getExpandInitialRpcTimeout()); + LOGGER.info( + "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout()); } if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) { expandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getExpandRpcTimeoutMultiplier()); + LOGGER.info( + "ExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getExpandMaxRpcTimeout() != null) { expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout()); + LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout()); } if (this.clientProperties.getExpandTotalTimeout() != null) { expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout()); + LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout()); } clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build()); RetrySettings.Builder collectRetrySettingBuilder = @@ -131,16 +165,23 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getCollectInitialRpcTimeout() != null) { collectRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getCollectInitialRpcTimeout()); + LOGGER.info( + "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout()); } if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) { collectRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getCollectRpcTimeoutMultiplier()); + LOGGER.info( + "CollectRpcTimeoutMultiplier set to " + + this.clientProperties.getCollectRpcTimeoutMultiplier()); } if (this.clientProperties.getCollectMaxRpcTimeout() != null) { collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout()); + LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout()); } if (this.clientProperties.getCollectTotalTimeout() != null) { collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout()); + LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout()); } clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build()); RetrySettings.Builder chatRetrySettingBuilder = @@ -148,16 +189,22 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getChatInitialRpcTimeout() != null) { chatRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getChatInitialRpcTimeout()); + LOGGER.info( + "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout()); } if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) { chatRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getChatRpcTimeoutMultiplier()); + LOGGER.info( + "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier()); } if (this.clientProperties.getChatMaxRpcTimeout() != null) { chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout()); + LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout()); } if (this.clientProperties.getChatTotalTimeout() != null) { chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout()); + LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout()); } clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build()); RetrySettings.Builder chatAgainRetrySettingBuilder = @@ -165,18 +212,28 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) { chatAgainRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getChatAgainInitialRpcTimeout()); + LOGGER.info( + "ChatAgainInitialRpcTimeout set to " + + this.clientProperties.getChatAgainInitialRpcTimeout()); } if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) { chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + LOGGER.info( + "ChatAgainRpcTimeoutMultiplier set to " + + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); } if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) { chatAgainRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getChatAgainMaxRpcTimeout()); + LOGGER.info( + "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout()); } if (this.clientProperties.getChatAgainTotalTimeout() != null) { chatAgainRetrySettingBuilder.setTotalTimeout( this.clientProperties.getChatAgainTotalTimeout()); + LOGGER.info( + "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout()); } clientSettingsBuilder .chatAgainSettings() @@ -186,30 +243,48 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) { pagedExpandRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getPagedExpandInitialRetryDelay()); + LOGGER.info( + "PagedExpandInitialRetryDelay set to " + + this.clientProperties.getPagedExpandInitialRetryDelay()); } if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) { pagedExpandRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getPagedExpandRetryDelayMultiplier()); + LOGGER.info( + "PagedExpandRetryDelayMultiplier set to " + + this.clientProperties.getPagedExpandRetryDelayMultiplier()); } if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) { pagedExpandRetrySettingBuilder.setMaxRetryDelay( this.clientProperties.getPagedExpandMaxRetryDelay()); + LOGGER.info( + "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay()); } if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) { pagedExpandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getPagedExpandInitialRpcTimeout()); + LOGGER.info( + "PagedExpandInitialRpcTimeout set to " + + this.clientProperties.getPagedExpandInitialRpcTimeout()); } if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) { pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "PagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) { pagedExpandRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getPagedExpandMaxRpcTimeout()); + LOGGER.info( + "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout()); } if (this.clientProperties.getPagedExpandTotalTimeout() != null) { pagedExpandRetrySettingBuilder.setTotalTimeout( this.clientProperties.getPagedExpandTotalTimeout()); + LOGGER.info( + "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout()); } clientSettingsBuilder .pagedExpandSettings() @@ -219,18 +294,30 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) { simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + LOGGER.info( + "SimplePagedExpandInitialRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); } if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) { simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "SimplePagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) { simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + LOGGER.info( + "SimplePagedExpandMaxRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); } if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) { simplePagedExpandRetrySettingBuilder.setTotalTimeout( this.clientProperties.getSimplePagedExpandTotalTimeout()); + LOGGER.info( + "SimplePagedExpandTotalTimeout set to " + + this.clientProperties.getSimplePagedExpandTotalTimeout()); } clientSettingsBuilder .simplePagedExpandSettings() @@ -240,16 +327,22 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getWaitInitialRpcTimeout() != null) { waitRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getWaitInitialRpcTimeout()); + LOGGER.info( + "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout()); } if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) { waitRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getWaitRpcTimeoutMultiplier()); + LOGGER.info( + "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier()); } if (this.clientProperties.getWaitMaxRpcTimeout() != null) { waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout()); + LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout()); } if (this.clientProperties.getWaitTotalTimeout() != null) { waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout()); + LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout()); } clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build()); RetrySettings.Builder blockRetrySettingBuilder = @@ -257,16 +350,23 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getBlockInitialRpcTimeout() != null) { blockRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getBlockInitialRpcTimeout()); + LOGGER.info( + "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout()); } if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) { blockRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getBlockRpcTimeoutMultiplier()); + LOGGER.info( + "BlockRpcTimeoutMultiplier set to " + + this.clientProperties.getBlockRpcTimeoutMultiplier()); } if (this.clientProperties.getBlockMaxRpcTimeout() != null) { blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout()); + LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout()); } if (this.clientProperties.getBlockTotalTimeout() != null) { blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout()); + LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout()); } clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build()); RetrySettings.Builder collideNameRetrySettingBuilder = @@ -274,18 +374,28 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) { collideNameRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getCollideNameInitialRpcTimeout()); + LOGGER.info( + "CollideNameInitialRpcTimeout set to " + + this.clientProperties.getCollideNameInitialRpcTimeout()); } if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) { collideNameRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + LOGGER.info( + "CollideNameRpcTimeoutMultiplier set to " + + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); } if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) { collideNameRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getCollideNameMaxRpcTimeout()); + LOGGER.info( + "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout()); } if (this.clientProperties.getCollideNameTotalTimeout() != null) { collideNameRetrySettingBuilder.setTotalTimeout( this.clientProperties.getCollideNameTotalTimeout()); + LOGGER.info( + "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout()); } clientSettingsBuilder .collideNameSettings() diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 2f227c825f..7018ac2e55 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -26,6 +26,8 @@ import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; import javax.annotation.Generated; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -43,6 +45,7 @@ import org.threeten.bp.Duration; @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { this.clientProperties = clientProperties; @@ -74,6 +77,10 @@ public class EchoSpringAutoConfiguration { .setHeaderProvider(); if (this.clientProperties.getQuotaProjectId() != null) { clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + LOGGER.info( + "Quota project id set to " + + this.clientProperties.getQuotaProjectId() + + ", this overrides project id from credentials."); } if (this.clientProperties.getExecutorThreadCount() != null) { ExecutorProvider executorProvider = @@ -81,37 +88,51 @@ public class EchoSpringAutoConfiguration { .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) .build(); clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + LOGGER.info( + "Background executor thread count is " + this.clientProperties.getExecutorThreadCount()); } if (this.clientProperties.getUseRest()) { clientSettingsBuilder.setTransportChannelProvider( EchoSettings.defaultHttpJsonTransportProviderBuilder().build()); + LOGGER.info("Using HTTP transport channel"); } RetrySettings.Builder echoRetrySettingBuilder = clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); if (this.clientProperties.getEchoInitialRetryDelay() != null) { echoRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getEchoInitialRetryDelay()); + LOGGER.info( + "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay()); } if (this.clientProperties.getEchoRetryDelayMultiplier() != null) { echoRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getEchoRetryDelayMultiplier()); + LOGGER.info( + "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier()); } if (this.clientProperties.getEchoMaxRetryDelay() != null) { echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay()); + LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay()); } if (this.clientProperties.getEchoInitialRpcTimeout() != null) { echoRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getEchoInitialRpcTimeout()); + LOGGER.info( + "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout()); } if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) { echoRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getEchoRpcTimeoutMultiplier()); + LOGGER.info( + "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier()); } if (this.clientProperties.getEchoMaxRpcTimeout() != null) { echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout()); + LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout()); } if (this.clientProperties.getEchoTotalTimeout() != null) { echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout()); + LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout()); } clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build()); RetrySettings.Builder expandRetrySettingBuilder = @@ -119,27 +140,40 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getExpandInitialRetryDelay() != null) { expandRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getExpandInitialRetryDelay()); + LOGGER.info( + "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay()); } if (this.clientProperties.getExpandRetryDelayMultiplier() != null) { expandRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getExpandRetryDelayMultiplier()); + LOGGER.info( + "ExpandRetryDelayMultiplier set to " + + this.clientProperties.getExpandRetryDelayMultiplier()); } if (this.clientProperties.getExpandMaxRetryDelay() != null) { expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay()); + LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay()); } if (this.clientProperties.getExpandInitialRpcTimeout() != null) { expandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getExpandInitialRpcTimeout()); + LOGGER.info( + "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout()); } if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) { expandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getExpandRpcTimeoutMultiplier()); + LOGGER.info( + "ExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getExpandMaxRpcTimeout() != null) { expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout()); + LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout()); } if (this.clientProperties.getExpandTotalTimeout() != null) { expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout()); + LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout()); } clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build()); RetrySettings.Builder collectRetrySettingBuilder = @@ -147,16 +181,23 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getCollectInitialRpcTimeout() != null) { collectRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getCollectInitialRpcTimeout()); + LOGGER.info( + "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout()); } if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) { collectRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getCollectRpcTimeoutMultiplier()); + LOGGER.info( + "CollectRpcTimeoutMultiplier set to " + + this.clientProperties.getCollectRpcTimeoutMultiplier()); } if (this.clientProperties.getCollectMaxRpcTimeout() != null) { collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout()); + LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout()); } if (this.clientProperties.getCollectTotalTimeout() != null) { collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout()); + LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout()); } clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build()); RetrySettings.Builder chatRetrySettingBuilder = @@ -164,16 +205,22 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getChatInitialRpcTimeout() != null) { chatRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getChatInitialRpcTimeout()); + LOGGER.info( + "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout()); } if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) { chatRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getChatRpcTimeoutMultiplier()); + LOGGER.info( + "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier()); } if (this.clientProperties.getChatMaxRpcTimeout() != null) { chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout()); + LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout()); } if (this.clientProperties.getChatTotalTimeout() != null) { chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout()); + LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout()); } clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build()); RetrySettings.Builder chatAgainRetrySettingBuilder = @@ -181,18 +228,28 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) { chatAgainRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getChatAgainInitialRpcTimeout()); + LOGGER.info( + "ChatAgainInitialRpcTimeout set to " + + this.clientProperties.getChatAgainInitialRpcTimeout()); } if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) { chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + LOGGER.info( + "ChatAgainRpcTimeoutMultiplier set to " + + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); } if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) { chatAgainRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getChatAgainMaxRpcTimeout()); + LOGGER.info( + "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout()); } if (this.clientProperties.getChatAgainTotalTimeout() != null) { chatAgainRetrySettingBuilder.setTotalTimeout( this.clientProperties.getChatAgainTotalTimeout()); + LOGGER.info( + "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout()); } clientSettingsBuilder .chatAgainSettings() @@ -202,30 +259,48 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) { pagedExpandRetrySettingBuilder.setInitialRetryDelay( this.clientProperties.getPagedExpandInitialRetryDelay()); + LOGGER.info( + "PagedExpandInitialRetryDelay set to " + + this.clientProperties.getPagedExpandInitialRetryDelay()); } if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) { pagedExpandRetrySettingBuilder.setRetryDelayMultiplier( this.clientProperties.getPagedExpandRetryDelayMultiplier()); + LOGGER.info( + "PagedExpandRetryDelayMultiplier set to " + + this.clientProperties.getPagedExpandRetryDelayMultiplier()); } if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) { pagedExpandRetrySettingBuilder.setMaxRetryDelay( this.clientProperties.getPagedExpandMaxRetryDelay()); + LOGGER.info( + "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay()); } if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) { pagedExpandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getPagedExpandInitialRpcTimeout()); + LOGGER.info( + "PagedExpandInitialRpcTimeout set to " + + this.clientProperties.getPagedExpandInitialRpcTimeout()); } if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) { pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "PagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) { pagedExpandRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getPagedExpandMaxRpcTimeout()); + LOGGER.info( + "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout()); } if (this.clientProperties.getPagedExpandTotalTimeout() != null) { pagedExpandRetrySettingBuilder.setTotalTimeout( this.clientProperties.getPagedExpandTotalTimeout()); + LOGGER.info( + "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout()); } clientSettingsBuilder .pagedExpandSettings() @@ -235,18 +310,30 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) { simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + LOGGER.info( + "SimplePagedExpandInitialRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); } if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) { simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "SimplePagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); } if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) { simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + LOGGER.info( + "SimplePagedExpandMaxRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); } if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) { simplePagedExpandRetrySettingBuilder.setTotalTimeout( this.clientProperties.getSimplePagedExpandTotalTimeout()); + LOGGER.info( + "SimplePagedExpandTotalTimeout set to " + + this.clientProperties.getSimplePagedExpandTotalTimeout()); } clientSettingsBuilder .simplePagedExpandSettings() @@ -256,16 +343,22 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getWaitInitialRpcTimeout() != null) { waitRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getWaitInitialRpcTimeout()); + LOGGER.info( + "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout()); } if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) { waitRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getWaitRpcTimeoutMultiplier()); + LOGGER.info( + "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier()); } if (this.clientProperties.getWaitMaxRpcTimeout() != null) { waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout()); + LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout()); } if (this.clientProperties.getWaitTotalTimeout() != null) { waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout()); + LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout()); } clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build()); RetrySettings.Builder blockRetrySettingBuilder = @@ -273,16 +366,23 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getBlockInitialRpcTimeout() != null) { blockRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getBlockInitialRpcTimeout()); + LOGGER.info( + "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout()); } if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) { blockRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getBlockRpcTimeoutMultiplier()); + LOGGER.info( + "BlockRpcTimeoutMultiplier set to " + + this.clientProperties.getBlockRpcTimeoutMultiplier()); } if (this.clientProperties.getBlockMaxRpcTimeout() != null) { blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout()); + LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout()); } if (this.clientProperties.getBlockTotalTimeout() != null) { blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout()); + LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout()); } clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build()); RetrySettings.Builder collideNameRetrySettingBuilder = @@ -290,18 +390,28 @@ public class EchoSpringAutoConfiguration { if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) { collideNameRetrySettingBuilder.setInitialRpcTimeout( this.clientProperties.getCollideNameInitialRpcTimeout()); + LOGGER.info( + "CollideNameInitialRpcTimeout set to " + + this.clientProperties.getCollideNameInitialRpcTimeout()); } if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) { collideNameRetrySettingBuilder.setRpcTimeoutMultiplier( this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + LOGGER.info( + "CollideNameRpcTimeoutMultiplier set to " + + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); } if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) { collideNameRetrySettingBuilder.setMaxRpcTimeout( this.clientProperties.getCollideNameMaxRpcTimeout()); + LOGGER.info( + "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout()); } if (this.clientProperties.getCollideNameTotalTimeout() != null) { collideNameRetrySettingBuilder.setTotalTimeout( this.clientProperties.getCollideNameTotalTimeout()); + LOGGER.info( + "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout()); } clientSettingsBuilder .collideNameSettings() From c45ec2305a16b3a5af2b32bb6eccd3160cd9f310 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Mon, 24 Oct 2022 10:08:07 -0400 Subject: [PATCH 043/103] feat(Spring CodeGen): Add customized spring composer for package info (#1059) * Add SpringPackageInfoComposer.java to generate package-info.java, similar to ClientLibraryPackageInfoComposer.java but customized for spring. * In SpringWriter.java, remove generation of gapic_metadata.json for spring libraries. --- .../api/generator/spring/SpringGenerator.java | 3 +- .../api/generator/spring/SpringWriter.java | 25 +-------- .../spring/composer/SpringComposer.java | 14 +++++ .../composer/SpringPackageInfoComposer.java | 55 +++++++++++++++++++ .../spring/composer/SpringComposerTest.java | 14 +++++ .../SpringPackageInfoComposerTest.java | 47 ++++++++++++++++ .../composer/goldens/SpringPackageInfo.golden | 5 ++ .../goldens/SpringPackageInfoFull.golden | 21 +++++++ 8 files changed, 160 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/google/api/generator/spring/composer/SpringPackageInfoComposer.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/SpringPackageInfoComposerTest.java create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden diff --git a/src/main/java/com/google/api/generator/spring/SpringGenerator.java b/src/main/java/com/google/api/generator/spring/SpringGenerator.java index 3df06aa5e2..b85f310d49 100644 --- a/src/main/java/com/google/api/generator/spring/SpringGenerator.java +++ b/src/main/java/com/google/api/generator/spring/SpringGenerator.java @@ -14,7 +14,6 @@ package com.google.api.generator.spring; -import com.google.api.generator.gapic.composer.Composer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; @@ -28,7 +27,7 @@ public class SpringGenerator { public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) { GapicContext context = Parser.parse(request); List clazzes = SpringComposer.composeServiceAutoConfigClasses(context); - GapicPackageInfo packageInfo = Composer.composePackageInfo(context); + GapicPackageInfo packageInfo = SpringComposer.composePackageInfo(context); String outputFilename = "temp-codegen-spring.srcjar"; return SpringWriter.write(context, clazzes, packageInfo, outputFilename); } diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 67925a38bd..cf8f4ca7f8 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -23,7 +23,6 @@ import com.google.api.generator.spring.utils.Utils; import com.google.protobuf.ByteString; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; -import com.google.protobuf.util.JsonFormat; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; @@ -61,8 +60,8 @@ public static CodeGeneratorResponse write( writeAutoConfigRegistration(context, jos); writeSpringAdditionalMetadataJson(context, jos); - // TODO: metadata and package info not custimized for Spring - writeMetadataFile(context, writePackageInfo(gapicPackageInfo, codeWriter, jos), jos); + // write package-info.java + writePackageInfo(gapicPackageInfo, codeWriter, jos); try { jos.finish(); @@ -111,8 +110,7 @@ private static String writePackageInfo( String code = codeWriter.write(); codeWriter.clear(); - String packagePath = - "src/main/java/" + packageInfo.pakkage().replaceAll("\\.", "/") + "/spring"; + String packagePath = "src/main/java/" + packageInfo.pakkage().replaceAll("\\.", "/"); JarEntry jarEntry = new JarEntry(String.format("%s/package-info.java", packagePath)); try { jos.putNextEntry(jarEntry); @@ -123,19 +121,6 @@ private static String writePackageInfo( return packagePath; } - private static void writeMetadataFile(GapicContext context, String path, JarOutputStream jos) { - if (context.gapicMetadataEnabled()) { - JarEntry jarEntry = new JarEntry(String.format("%s/gapic_metadata.json", path)); - try { - jos.putNextEntry(jarEntry); - jos.write( - JsonFormat.printer().print(context.gapicMetadata()).getBytes(StandardCharsets.UTF_8)); - } catch (IOException e) { - throw new GapicWriterException("Could not write gapic_metadata.json", e); - } - } - } - private static void writeAutoConfigRegistration(GapicContext context, JarOutputStream jos) { String path = "src/main/resources/META-INF/spring"; JarEntry jarEntry = @@ -202,8 +187,4 @@ private static String getPath(String pakkage, String className) { } return path; } - - private static String getSamplePackage(GapicClass gapicClazz) { - return gapicClazz.classDefinition().packageString().concat(".samples"); - } } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index 2a039224bf..ad8c581841 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -18,6 +18,7 @@ import com.google.api.generator.gapic.composer.comment.CommentComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.gapic.model.Transport; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,10 @@ public static List composeServiceAutoConfigClasses(GapicContext cont return addApacheLicense(clazzes); } + public static GapicPackageInfo composePackageInfo(GapicContext context) { + return addApacheLicense(SpringPackageInfoComposer.generatePackageInfo(context)); + } + protected static List generatePerServiceClasses(GapicContext context) { List clazzes = new ArrayList<>(); context @@ -59,4 +64,13 @@ protected static List addApacheLicense(List gapicClassLi }) .collect(Collectors.toList()); } + + private static GapicPackageInfo addApacheLicense(GapicPackageInfo gapicPackageInfo) { + return GapicPackageInfo.with( + gapicPackageInfo + .packageInfo() + .toBuilder() + .setFileHeader(CommentComposer.APACHE_LICENSE_COMMENT) + .build()); + } } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPackageInfoComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPackageInfoComposer.java new file mode 100644 index 0000000000..aa94bb3841 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPackageInfoComposer.java @@ -0,0 +1,55 @@ +// 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.spring.composer; + +import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.ConcreteReference; +import com.google.api.generator.engine.ast.JavaDocComment; +import com.google.api.generator.engine.ast.PackageInfoDefinition; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicPackageInfo; +import com.google.api.generator.spring.utils.Utils; +import com.google.common.base.Preconditions; +import javax.annotation.Generated; + +public class SpringPackageInfoComposer { + private static final String PACKAGE_INFO_TITLE_PATTERN = + "Spring Boot auto-configurations for %s."; + + public static GapicPackageInfo generatePackageInfo(GapicContext context) { + Preconditions.checkState(!context.services().isEmpty(), "No services found to generate"); + PackageInfoDefinition packageInfo = + PackageInfoDefinition.builder() + .setPakkage(Utils.getSpringPackageName(Utils.getPackageName(context))) + .setHeaderCommentStatements(createPackageInfoJavadoc(context)) + .setAnnotations( + AnnotationNode.builder() + .setType(TypeNode.withReference(ConcreteReference.withClazz(Generated.class))) + .setDescription("by gapic-generator-java") + .build()) + .build(); + return GapicPackageInfo.with(packageInfo); + } + + private static CommentStatement createPackageInfoJavadoc(GapicContext context) { + JavaDocComment.Builder javaDocCommentBuilder = JavaDocComment.builder(); + javaDocCommentBuilder = + javaDocCommentBuilder.addComment( + String.format(PACKAGE_INFO_TITLE_PATTERN, Utils.getLibName(context))); + return CommentStatement.withComment(javaDocCommentBuilder.build()); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java index 3f2a1abb24..6f9493f4c2 100644 --- a/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/composer/SpringComposerTest.java @@ -14,10 +14,15 @@ package com.google.api.generator.spring.composer; +import com.google.api.generator.engine.writer.JavaWriterVisitor; import com.google.api.generator.gapic.composer.common.TestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicPackageInfo; 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 java.util.List; import org.junit.Before; import org.junit.Test; @@ -34,11 +39,20 @@ public void setUp() { public void spring_composer_test() { List gapicClasses = SpringComposer.composeServiceAutoConfigClasses(context); + GapicPackageInfo packageInfo = SpringComposer.composePackageInfo(context); // write to verify result for now for (GapicClass gapicClazz : gapicClasses) { String fileName = gapicClazz.classDefinition().classIdentifier() + "Full.golden"; Assert.assertGoldenClass(this.getClass(), gapicClazz, fileName); } + + String packageInfoFileName = "SpringPackageInfoFull.golden"; + JavaWriterVisitor visitor = new JavaWriterVisitor(); + packageInfo.packageInfo().accept(visitor); + Utils.saveCodegenToFile(this.getClass(), packageInfoFileName, visitor.write()); + Path packageInfoGoldenFilePath = + Paths.get(Utils.getGoldenDir(this.getClass()), packageInfoFileName); + Assert.assertCodeEquals(packageInfoGoldenFilePath, visitor.write()); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringPackageInfoComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringPackageInfoComposerTest.java new file mode 100644 index 0000000000..9a044c0c15 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/SpringPackageInfoComposerTest.java @@ -0,0 +1,47 @@ +// 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.spring.composer; + +import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.common.TestProtoLoader; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.GapicPackageInfo; +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.Before; +import org.junit.Test; + +public class SpringPackageInfoComposerTest { + private GapicContext context; + + @Before + public void setUp() { + this.context = TestProtoLoader.instance().parseShowcaseEcho(); + } + + @Test + public void generateSpringPackageInfoTest() { + GapicPackageInfo packageInfo = SpringPackageInfoComposer.generatePackageInfo(this.context); + JavaWriterVisitor visitor = new JavaWriterVisitor(); + packageInfo.packageInfo().accept(visitor); + String fileName = "SpringPackageInfo.golden"; + + Utils.saveCodegenToFile(this.getClass(), fileName, visitor.write()); + Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), fileName); + Assert.assertCodeEquals(goldenFilePath, visitor.write()); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden new file mode 100644 index 0000000000..d7ed65e461 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden @@ -0,0 +1,5 @@ +/** Spring Boot auto-configurations for showcase. */ +@Generated("by gapic-generator-java") +package com.google.showcase.v1beta1.spring; + +import javax.annotation.Generated; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden new file mode 100644 index 0000000000..4be7458a76 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden @@ -0,0 +1,21 @@ +/* + * 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 + * + * https://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. + */ + +/** Spring Boot auto-configurations for showcase. */ +@Generated("by gapic-generator-java") +package com.google.showcase.v1beta1.spring; + +import javax.annotation.Generated; From c51d51bc495ea1284087b66c369dedf741dd4824 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 26 Oct 2022 11:34:07 -0400 Subject: [PATCH 044/103] feat(Spring CodeGen): write pom.xml with SpringWriter. (#1057) This is a draft to generate pom.xml for Spring Starters modules. The placeholders in this generated file will be replaced in spring-cloud-gcp when triggering the generation (e.g. via script) Update: updated to use utils added in #1061 We'll likely need to make more changes to pom generation depending on the project structure on spring-cloud-gcp side. But I'd like to merge this in first, and iterate as needed together with spring-cloud-gcp side. --- .../api/generator/spring/SpringWriter.java | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index cf8f4ca7f8..955fbde8d4 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -59,6 +59,7 @@ public static CodeGeneratorResponse write( // write spring.factories file writeAutoConfigRegistration(context, jos); writeSpringAdditionalMetadataJson(context, jos); + writePom(context, jos); // write package-info.java writePackageInfo(gapicPackageInfo, codeWriter, jos); @@ -173,6 +174,96 @@ private static void writeSpringAdditionalMetadataJson(GapicContext context, JarO } } + private static void writePom(GapicContext context, JarOutputStream jos) { + String pakkageName = Utils.getPackageName(context); + pakkageName = pakkageName.replace('.', '-'); + String clientLibraryShortName = Utils.getLibName(context); + String clientLibraryGroupId = "{{client-library-group-id}}"; + String clientLibraryName = "{{client-library-artifact-id}}"; + String clientLibraryVersion = "{{client-library-version}}"; + + String springStarterArtifactId = pakkageName + "-spring-starter"; + String springStarterVersion = "{{starter-version}}"; + String springStarterName = "Spring Boot Starter - " + clientLibraryShortName; + + JarEntry jarEntry = new JarEntry("pom.xml"); + try { + jos.putNextEntry(jarEntry); + StringJoiner sb = new StringJoiner(",\\\n"); + sb.add( + String.format( + "\n" + + "\n" + + " 4.0.0\n" + + "\n" + + " com.google.cloud\n" + + " %s\n" + + " %s\n" + + " %s\n" + + " Spring Boot Starter with AutoConfiguration for %s\n" + + "\n" + + "\n" + + " \n" + + " \n" + + " %s\n" + + " %s\n" + + " %s\n" + + " \n" + + "\n" + + " \n" + + " org.springframework.boot\n" + + " spring-boot-starter\n" + + " 2.6.3\n" + + " \n" + + "\n" + + " \n" + + " com.google.cloud\n" + + " spring-cloud-gcp-core\n" + + " 3.2.1\n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " org.apache.maven.plugins\n" + + " maven-jar-plugin\n" + + " 3.2.2\n" + + " \n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + " org.apache.maven.plugins\n" + + " maven-jar-plugin\n" + + " \n" + + " \n" + + " \n" + + " true\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n" + + "", + springStarterArtifactId, + springStarterVersion, + springStarterName, + clientLibraryShortName, + clientLibraryGroupId, + clientLibraryName, + clientLibraryVersion)); + + jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + throw new GapicWriterException("Could not write pom.xml", e); + } + } + private static String getPath(String pakkage, String className) { String path = pakkage.replaceAll("\\.", "/"); if (className.startsWith("Mock") || className.endsWith("Test")) { From cb83057cb6586672760e4b23b4cd831c86c91f9c Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Wed, 2 Nov 2022 11:37:26 -0400 Subject: [PATCH 045/103] test(spring): add tests for content-building methods in SpringWriter (#1074) * Extracts content-building logic in SpringWriter not covered by composers into own methods with visibility for testing * Adds unit testing for: * Contents of org.springframework.boot.autoconfigure.AutoConfiguration.imports (string comparison) * Contents of additional-spring-configuration-metadata.json (generates and updates golden file) * Contents of pom.xml (generates and updates golden file) --- .../api/generator/spring/SpringWriter.java | 244 ++++++++++-------- .../generator/spring/SpringWriterTest.java | 60 +++++ .../SpringAdditionalMetadataJson.golden | 10 + .../spring/goldens/SpringPackagePom.golden | 58 +++++ 4 files changed, 267 insertions(+), 105 deletions(-) create mode 100644 src/test/java/com/google/api/generator/spring/SpringWriterTest.java create mode 100644 src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden create mode 100644 src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 955fbde8d4..6b1280d3dc 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -21,6 +21,13 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.spring.utils.Utils; +import com.google.common.annotations.VisibleForTesting; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.protobuf.ByteString; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.io.IOException; @@ -122,59 +129,81 @@ private static String writePackageInfo( return packagePath; } + @VisibleForTesting + static String buildAutoConfigRegistrationString(GapicContext context) { + StringJoiner sb = new StringJoiner("\n", "", ""); + context + .services() + .forEach( + service -> + sb.add( + String.format( + "%s.spring.%sSpringAutoConfig", service.pakkage(), service.name()))); + return sb.toString(); + } + private static void writeAutoConfigRegistration(GapicContext context, JarOutputStream jos) { String path = "src/main/resources/META-INF/spring"; - JarEntry jarEntry = - new JarEntry( - String.format( - "%s/org.springframework.boot.autoconfigure.AutoConfiguration.imports", path)); + String fileName = + String.format("%s/org.springframework.boot.autoconfigure.AutoConfiguration.imports", path); + JarEntry jarEntry = new JarEntry(fileName); try { jos.putNextEntry(jarEntry); - StringJoiner sb = new StringJoiner("\n", "", ""); - context - .services() - .forEach( - service -> - sb.add( - String.format( - "%s.spring.%sSpringAutoConfig", service.pakkage(), service.name()))); - - jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + String result = buildAutoConfigRegistrationString(context); + jos.write(result.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { - throw new GapicWriterException("Could not write spring.factories", e); + throw new GapicWriterException( + String.format("Could not write spring autoconfiguration registration to %s", fileName), + e); } } + @VisibleForTesting + static String buildSpringAdditionalMetadataJsonString(GapicContext context) { + JsonObject jsonResult = new JsonObject(); + JsonArray objectArray = new JsonArray(); + context + .services() + .forEach( + service -> { + JsonObject innerObject = new JsonObject(); + innerObject.addProperty( + "name", + String.format( + "%s.enabled", + Utils.getSpringPropertyPrefix( + Utils.getPackageName(context), service.name()))); + innerObject.addProperty("type", "java.lang.Boolean"); + innerObject.addProperty( + "description", + String.format( + "Auto-configure Google Cloud %s components.", + Utils.getLibName(context) + "/" + service.name())); + innerObject.addProperty("defaultValue", true); + objectArray.add(innerObject); + }); + jsonResult.add("properties", objectArray); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + JsonElement prettyJson = JsonParser.parseString(jsonResult.toString()); + return gson.toJson(prettyJson); + } + private static void writeSpringAdditionalMetadataJson(GapicContext context, JarOutputStream jos) { String path = "src/main/resources/META-INF"; JarEntry jarEntry = new JarEntry(String.format("%s/additional-spring-configuration-metadata.json", path)); try { jos.putNextEntry(jarEntry); - StringJoiner sb = new StringJoiner(",\n", "\n{\n \"properties\": [\n", "\n ]\n" + "}"); - context - .services() - .forEach( - service -> - sb.add( - String.format( - " {\n" - + " \"name\": \"%s.enabled\",\n" - + " \"type\": \"java.lang.Boolean\",\n" - + " \"description\": \"Auto-configure Google Cloud %s components.\",\n" - + " \"defaultValue\": true\n" - + " }", - Utils.getSpringPropertyPrefix( - Utils.getPackageName(context), service.name()), - Utils.getLibName(context) + "/" + service.name()))); - - jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + String result = buildSpringAdditionalMetadataJsonString(context); + jos.write(result.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { - throw new GapicWriterException("Could not write spring.factories", e); + throw new GapicWriterException( + "Could not write additional-spring-configuration-metadata.json", e); } } - private static void writePom(GapicContext context, JarOutputStream jos) { + @VisibleForTesting + static String buildPomString(GapicContext context) { String pakkageName = Utils.getPackageName(context); pakkageName = pakkageName.replace('.', '-'); String clientLibraryShortName = Utils.getLibName(context); @@ -186,79 +215,84 @@ private static void writePom(GapicContext context, JarOutputStream jos) { String springStarterVersion = "{{starter-version}}"; String springStarterName = "Spring Boot Starter - " + clientLibraryShortName; + StringJoiner sb = new StringJoiner(",\\\n"); + sb.add( + String.format( + "\n" + + "\n" + + " 4.0.0\n" + + "\n" + + " com.google.cloud\n" + + " %s\n" + + " %s\n" + + " %s\n" + + " Spring Boot Starter with AutoConfiguration for %s\n" + + "\n" + + "\n" + + " \n" + + " \n" + + " %s\n" + + " %s\n" + + " %s\n" + + " \n" + + "\n" + + " \n" + + " org.springframework.boot\n" + + " spring-boot-starter\n" + + " 2.6.3\n" + + " \n" + + "\n" + + " \n" + + " com.google.cloud\n" + + " spring-cloud-gcp-core\n" + + " 3.2.1\n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " org.apache.maven.plugins\n" + + " maven-jar-plugin\n" + + " 3.2.2\n" + + " \n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + " org.apache.maven.plugins\n" + + " maven-jar-plugin\n" + + " \n" + + " \n" + + " \n" + + " true\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n" + + "", + springStarterArtifactId, + springStarterVersion, + springStarterName, + clientLibraryShortName, + clientLibraryGroupId, + clientLibraryName, + clientLibraryVersion)); + + return sb.toString(); + } + + private static void writePom(GapicContext context, JarOutputStream jos) { JarEntry jarEntry = new JarEntry("pom.xml"); try { jos.putNextEntry(jarEntry); - StringJoiner sb = new StringJoiner(",\\\n"); - sb.add( - String.format( - "\n" - + "\n" - + " 4.0.0\n" - + "\n" - + " com.google.cloud\n" - + " %s\n" - + " %s\n" - + " %s\n" - + " Spring Boot Starter with AutoConfiguration for %s\n" - + "\n" - + "\n" - + " \n" - + " \n" - + " %s\n" - + " %s\n" - + " %s\n" - + " \n" - + "\n" - + " \n" - + " org.springframework.boot\n" - + " spring-boot-starter\n" - + " 2.6.3\n" - + " \n" - + "\n" - + " \n" - + " com.google.cloud\n" - + " spring-cloud-gcp-core\n" - + " 3.2.1\n" - + " \n" - + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " org.apache.maven.plugins\n" - + " maven-jar-plugin\n" - + " 3.2.2\n" - + " \n" - + " \n" - + " \n" - + "\n" - + " \n" - + " \n" - + " org.apache.maven.plugins\n" - + " maven-jar-plugin\n" - + " \n" - + " \n" - + " \n" - + " true\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + "\n" - + "", - springStarterArtifactId, - springStarterVersion, - springStarterName, - clientLibraryShortName, - clientLibraryGroupId, - clientLibraryName, - clientLibraryVersion)); - - jos.write(sb.toString().getBytes(StandardCharsets.UTF_8)); + String result = buildPomString(context); + jos.write(result.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { throw new GapicWriterException("Could not write pom.xml", e); } diff --git a/src/test/java/com/google/api/generator/spring/SpringWriterTest.java b/src/test/java/com/google/api/generator/spring/SpringWriterTest.java new file mode 100644 index 0000000000..24369f5e12 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/SpringWriterTest.java @@ -0,0 +1,60 @@ +// 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.spring; + +import static org.junit.Assert.assertEquals; + +import com.google.api.generator.gapic.composer.common.TestProtoLoader; +import com.google.api.generator.gapic.model.GapicContext; +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.Before; +import org.junit.Test; + +public class SpringWriterTest { + private GapicContext context; + + @Before + public void setUp() { + this.context = TestProtoLoader.instance().parseShowcaseEcho(); + } + + @Test + public void buildAutoConfigRegistrationStringTest() { + String result = SpringWriter.buildAutoConfigRegistrationString(context); + String expected = "com.google.showcase.v1beta1.spring.EchoSpringAutoConfig"; + assertEquals(expected, result); + } + + @Test + public void buildSpringAdditionalMetadataJsonStringTest() { + String result = SpringWriter.buildSpringAdditionalMetadataJsonString(context); + String fileName = "SpringAdditionalMetadataJson.golden"; + Utils.saveCodegenToFile(this.getClass(), fileName, result); + Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), fileName); + Assert.assertCodeEquals(goldenFilePath, result); + } + + @Test + public void buildPomStringTest() { + String result = SpringWriter.buildPomString(context); + String fileName = "SpringPackagePom.golden"; + Utils.saveCodegenToFile(this.getClass(), fileName, result); + Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), fileName); + Assert.assertCodeEquals(goldenFilePath, result); + } +} diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden new file mode 100644 index 0000000000..5da3bd87f0 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden @@ -0,0 +1,10 @@ +{ + "properties": [ + { + "name": "com.google.showcase.v1beta1.spring.auto.echo.enabled", + "type": "java.lang.Boolean", + "description": "Auto-configure Google Cloud showcase/Echo components.", + "defaultValue": true + } + ] +} \ No newline at end of file diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden new file mode 100644 index 0000000000..4c6080fe0d --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -0,0 +1,58 @@ + + + 4.0.0 + + com.google.cloud + com-google-showcase-v1beta1-spring-starter + {{starter-version}} + Spring Boot Starter - showcase + Spring Boot Starter with AutoConfiguration for showcase + + + + + {{client-library-group-id}} + {{client-library-artifact-id}} + {{client-library-version}} + + + + org.springframework.boot + spring-boot-starter + 2.6.3 + + + + com.google.cloud + spring-cloud-gcp-core + 3.2.1 + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + + + + + + + + \ No newline at end of file From 001926591400db116ec4e6948a26133d0f34c320 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 2 Nov 2022 15:19:13 -0400 Subject: [PATCH 046/103] feat(SpringGen): adding extra annotations at the `SpringComposer` step for all Spring classes generated (#1062) this pr: - adds a @BetaApi annotation for each class composed in SpringComposer - also moves the @Generated("by gapic-generator-java") annotation to SpringComposer for consistency. (this annotation was missing for the properties class composer.) - Updating annotations in SpringComposer level for the ones that applies to all classes makes it easier for future changes when needed. --- .../SpringAutoConfigClassComposer.java | 7 --- .../spring/composer/SpringComposer.java | 51 ++++++++++++++++++- .../EchoSpringAutoConfiguration.golden | 2 - .../EchoSpringAutoConfigurationFull.golden | 2 + .../goldens/EchoSpringPropertiesFull.golden | 4 ++ 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index cec37f1b75..b45d858bb3 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -59,7 +59,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Generated; public class SpringAutoConfigClassComposer implements ClassComposer { private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; @@ -224,7 +223,6 @@ private static MethodDefinition createConstructor( private static List createClassAnnotations( Service service, Map types) { - // @Generated("by gapic-generator-java") // @AutoConfiguration // @ConditionalOnClass(LanguageServiceClient.class) // @ConditionalOnProperty(value = @@ -295,10 +293,6 @@ private static List createClassAnnotations( .build(); return Arrays.asList( - AnnotationNode.builder() - .setType(STATIC_TYPES.get("Generated")) - .setDescription("by gapic-generator-java") - .build(), configurationNode, conditionalOnClassNode, conditionalOnPropertyNode, @@ -825,7 +819,6 @@ private static MethodDefinition createClientBeanMethod( private static Map createStaticTypes() { List concreteClazzes = Arrays.asList( - Generated.class, RetrySettings.class, RetrySettings.Builder .class, // name will be just Builder. consider change of more than one builder here. diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index ad8c581841..b9f92c1f52 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -14,21 +14,31 @@ package com.google.api.generator.spring.composer; +import com.google.api.core.BetaApi; +import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.gapic.composer.comment.CommentComposer; +import com.google.api.generator.gapic.composer.store.TypeStore; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicPackageInfo; import com.google.api.generator.gapic.model.Transport; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Generated; public class SpringComposer { + + private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); + public static List composeServiceAutoConfigClasses(GapicContext context) { List clazzes = new ArrayList<>(); clazzes.addAll(generatePerServiceClasses(context)); - return addApacheLicense(clazzes); + List clazzesWithHeader = addApacheLicense(clazzes); + return addExtraClassAnnotations(clazzesWithHeader); } public static GapicPackageInfo composePackageInfo(GapicContext context) { @@ -65,6 +75,40 @@ protected static List addApacheLicense(List gapicClassLi .collect(Collectors.toList()); } + protected static List addExtraClassAnnotations(List gapicClassList) { + AnnotationNode generatedAnnotation = + AnnotationNode.builder() + .setType(FIXED_TYPESTORE.get("Generated")) + .setDescription("by gapic-generator-java") + .build(); + AnnotationNode betaAnnotation = + AnnotationNode.builder() + .setType(FIXED_TYPESTORE.get("BetaApi")) + .setDescription("Autogenerated Spring autoconfiguration is not yet stable") + .build(); + return gapicClassList.stream() + .map( + gapicClass -> { + ImmutableList classAnnotations = + gapicClass.classDefinition().annotations(); + ImmutableList updatedAnnotations = + ImmutableList.builder() + .add(generatedAnnotation) + .add(betaAnnotation) + .addAll(classAnnotations) + .build(); + ClassDefinition classWithUpdatedAnnotations = + gapicClass + .classDefinition() + .toBuilder() + .setAnnotations(updatedAnnotations) + .build(); + + return GapicClass.create(gapicClass.kind(), classWithUpdatedAnnotations); + }) + .collect(Collectors.toList()); + } + private static GapicPackageInfo addApacheLicense(GapicPackageInfo gapicPackageInfo) { return GapicPackageInfo.with( gapicPackageInfo @@ -73,4 +117,9 @@ private static GapicPackageInfo addApacheLicense(GapicPackageInfo gapicPackageIn .setFileHeader(CommentComposer.APACHE_LICENSE_COMMENT) .build()); } + + private static TypeStore createStaticTypes() { + List> concreteClazzes = Arrays.asList(BetaApi.class, Generated.class); + return new TypeStore(concreteClazzes); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index be91d0f036..6800a70f8c 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -9,7 +9,6 @@ import com.google.cloud.spring.core.DefaultCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; -import javax.annotation.Generated; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -20,7 +19,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.threeten.bp.Duration; -@Generated("by gapic-generator-java") @AutoConfiguration @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 7018ac2e55..25df0158b4 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -16,6 +16,7 @@ package com.google.showcase.v1beta1.spring; +import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; @@ -37,6 +38,7 @@ import org.springframework.context.annotation.Bean; import org.threeten.bp.Duration; @Generated("by gapic-generator-java") +@BetaApi("Autogenerated Spring autoconfiguration is not yet stable") @AutoConfiguration @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index a20c370430..c0a5400e7e 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -16,11 +16,15 @@ package com.google.showcase.v1beta1.spring; +import com.google.api.core.BetaApi; import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; +import javax.annotation.Generated; import org.springframework.boot.context.properties.ConfigurationProperties; import org.threeten.bp.Duration; +@Generated("by gapic-generator-java") +@BetaApi("Autogenerated Spring autoconfiguration is not yet stable") @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty From e754a7ccdd212c1b09bf458ad1b1a56e260f01e2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 13 Sep 2022 19:52:22 +0200 Subject: [PATCH 047/103] fix(deps): update dependency org.yaml:snakeyaml to v1.32 (#1037) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml/src) | `1.31` -> `1.32` | [![age](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.32/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.32/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.32/compatibility-slim/1.31)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.32/confidence-slim/1.31)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10f973578d..366a52b616 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ org.yaml snakeyaml - 1.31 + 1.32 com.google.googlejavaformat From dba69f494a45110431a2a2d7f4826f2e1074685a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 15 Sep 2022 14:14:30 +0200 Subject: [PATCH 048/103] fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#1039) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.2` -> `3.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/compatibility-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/confidence-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v3.0.3`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​303-httpsgithubcomgoogleapisjava-shared-dependenciescomparev302v303-2022-09-14) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.2...v3.0.3) ##### Dependencies - Google-cloud-core 2.8.12 ([#​799](https://togithub.com/googleapis/java-shared-dependencies/issues/799)) ([1b3db8d](https://togithub.com/googleapis/java-shared-dependencies/commit/1b3db8d1e17c49ebae79fc96164fa9058e1df6e3)) - Moving gson to first-party-dependencies ([#​800](https://togithub.com/googleapis/java-shared-dependencies/issues/800)) ([a41fcc1](https://togithub.com/googleapis/java-shared-dependencies/commit/a41fcc11d32e02e5af2837561792e3919f6d4b3f)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.6 ([#​797](https://togithub.com/googleapis/java-shared-dependencies/issues/797)) ([bc5fdc9](https://togithub.com/googleapis/java-shared-dependencies/commit/bc5fdc9b3af7973c28f063a9ac156fe2af562814)) - Update gax.version to v2.19.1 ([#​798](https://togithub.com/googleapis/java-shared-dependencies/issues/798)) ([84e5487](https://togithub.com/googleapis/java-shared-dependencies/commit/84e5487b2e3dce4bb60badecebde788c3cb702b8)) - Update google.core.version to v2.8.11 ([#​793](https://togithub.com/googleapis/java-shared-dependencies/issues/793)) ([63c1297](https://togithub.com/googleapis/java-shared-dependencies/commit/63c129722aa0b821031ff5b4c11004adf7b12044))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 366a52b616..77632587e8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.2 + 3.0.3 pom import From ce93705b68f2bbe20512d8de718859a5437153c4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Sep 2022 16:24:36 +0200 Subject: [PATCH 049/103] chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 (#1038) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-shade-plugin)) | `3.3.0` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77632587e8..aceac7589f 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.0 + 3.4.0 package From d6153055f6746192bd5f27335e7995a62d590f61 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 26 Sep 2022 16:30:15 +0200 Subject: [PATCH 050/103] fix(deps): update dependency org.yaml:snakeyaml to v1.33 (#1043) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml/src) | `1.32` -> `1.33` | [![age](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/compatibility-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/confidence-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aceac7589f..90d9744fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ org.yaml snakeyaml - 1.32 + 1.33 com.google.googlejavaformat From e58bf9de34905ae644c5a91bd81a7d16e31e4c77 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 3 Oct 2022 15:46:22 +0200 Subject: [PATCH 051/103] fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#1050) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.3` -> `3.0.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/compatibility-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/confidence-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v3.0.4`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​304-httpsgithubcomgoogleapisjava-shared-dependenciescomparev303v304-2022-10-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.3...v3.0.4) ##### Dependencies - Update dependency cachetools to v5 ([#​816](https://togithub.com/googleapis/java-shared-dependencies/issues/816)) ([3f6c408](https://togithub.com/googleapis/java-shared-dependencies/commit/3f6c408210c931c286235f61c7aadea5bf5cfe4d)) - Update dependency certifi to v2022.9.24 ([#​818](https://togithub.com/googleapis/java-shared-dependencies/issues/818)) ([5f04b97](https://togithub.com/googleapis/java-shared-dependencies/commit/5f04b97c2343146600e8c9ee65afdeb58f5743a6)) - Update dependency charset-normalizer to v2.1.1 ([#​822](https://togithub.com/googleapis/java-shared-dependencies/issues/822)) ([6997c5a](https://togithub.com/googleapis/java-shared-dependencies/commit/6997c5acad937ebe3594330de73261a424d42cf3)) - Update dependency click to v8.1.3 ([#​823](https://togithub.com/googleapis/java-shared-dependencies/issues/823)) ([42bf9f8](https://togithub.com/googleapis/java-shared-dependencies/commit/42bf9f834fdafea60f2be7ccbf7d363e058cd7c2)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.7 ([#​837](https://togithub.com/googleapis/java-shared-dependencies/issues/837)) ([d31e507](https://togithub.com/googleapis/java-shared-dependencies/commit/d31e5077c7e036de5e238e9a611df7ced527574a)) - Update dependency gcp-releasetool to v1.8.8 ([#​819](https://togithub.com/googleapis/java-shared-dependencies/issues/819)) ([8245d97](https://togithub.com/googleapis/java-shared-dependencies/commit/8245d975fb12e81454ec7664f9a7c9809bbac697)) - Update dependency gcp-releasetool to v1.8.9 ([#​846](https://togithub.com/googleapis/java-shared-dependencies/issues/846)) ([04e3283](https://togithub.com/googleapis/java-shared-dependencies/commit/04e32831c6e87c372444901013a747d2d02ce38d)) - Update dependency google-api-core to v2.10.1 ([#​824](https://togithub.com/googleapis/java-shared-dependencies/issues/824)) ([818b9aa](https://togithub.com/googleapis/java-shared-dependencies/commit/818b9aa2ac99d8b1f9b39a74b626122aed5f1d94)) - Update dependency google-auth to v2.12.0 ([#​825](https://togithub.com/googleapis/java-shared-dependencies/issues/825)) ([07c544b](https://togithub.com/googleapis/java-shared-dependencies/commit/07c544b5e0fa9f7110bbc957570f7a405962072e)) - Update dependency google-cloud-core to v2.3.2 ([#​820](https://togithub.com/googleapis/java-shared-dependencies/issues/820)) ([2a219e8](https://togithub.com/googleapis/java-shared-dependencies/commit/2a219e86f187ba5ad72f2570bd58ca6100128c43)) - Update dependency google-cloud-storage to v2.5.0 ([#​826](https://togithub.com/googleapis/java-shared-dependencies/issues/826)) ([bb10d18](https://togithub.com/googleapis/java-shared-dependencies/commit/bb10d1858a515f09d365362ffa0110a5b362c96b)) - Update dependency google-crc32c to v1.5.0 ([#​827](https://togithub.com/googleapis/java-shared-dependencies/issues/827)) ([7e5dae6](https://togithub.com/googleapis/java-shared-dependencies/commit/7e5dae60d667cb84b9ee4f6c977bdc35e79e4cf6)) - Update dependency google-resumable-media to v2.4.0 ([#​838](https://togithub.com/googleapis/java-shared-dependencies/issues/838)) ([ad82d63](https://togithub.com/googleapis/java-shared-dependencies/commit/ad82d6378f64039da383509638fb4782908eb4bc)) - Update dependency googleapis-common-protos to v1.56.4 ([#​821](https://togithub.com/googleapis/java-shared-dependencies/issues/821)) ([93d7745](https://togithub.com/googleapis/java-shared-dependencies/commit/93d77458c9bbf84ec367cdb4caaa41e6f71675c6)) - Update dependency importlib-metadata to v4.12.0 ([#​832](https://togithub.com/googleapis/java-shared-dependencies/issues/832)) ([ee19fb1](https://togithub.com/googleapis/java-shared-dependencies/commit/ee19fb1ca5a2a2e1985297e3b72d44de68bc72e3)) - Update dependency importlib-metadata to v4.13.0 ([#​843](https://togithub.com/googleapis/java-shared-dependencies/issues/843)) ([d2ede60](https://togithub.com/googleapis/java-shared-dependencies/commit/d2ede601eee8c875780c7eb5924623537480c509)) - Update dependency importlib-metadata to v5 ([#​845](https://togithub.com/googleapis/java-shared-dependencies/issues/845)) ([03ac7e8](https://togithub.com/googleapis/java-shared-dependencies/commit/03ac7e800274c5f58d2bc4ddd0561bfcdea1bb27)) - Update dependency io.grpc:grpc-bom to v1.49.1 ([#​802](https://togithub.com/googleapis/java-shared-dependencies/issues/802)) ([b8c54bf](https://togithub.com/googleapis/java-shared-dependencies/commit/b8c54bf8f1ddecc788cee151f8afe42de45bdc9d)) - Update dependency io.grpc:grpc-bom to v1.49.2 ([#​842](https://togithub.com/googleapis/java-shared-dependencies/issues/842)) ([1b1cfa2](https://togithub.com/googleapis/java-shared-dependencies/commit/1b1cfa27d05f7732da12721305cf41dcbebda232)) - Update dependency jeepney to v0.8.0 ([#​833](https://togithub.com/googleapis/java-shared-dependencies/issues/833)) ([15d2f9f](https://togithub.com/googleapis/java-shared-dependencies/commit/15d2f9f52b5a3259db0813df3d2424e256ccb372)) - Update dependency jinja2 to v3.1.2 ([#​834](https://togithub.com/googleapis/java-shared-dependencies/issues/834)) ([c188f95](https://togithub.com/googleapis/java-shared-dependencies/commit/c188f95acdb3349f1c4b3ed56e5fffb75e8fbc8d)) - Update dependency keyring to v23.9.3 ([#​828](https://togithub.com/googleapis/java-shared-dependencies/issues/828)) ([b185aaa](https://togithub.com/googleapis/java-shared-dependencies/commit/b185aaae716d4d97cb64f0426cac0e778f11223d)) - Update dependency markupsafe to v2.1.1 ([#​829](https://togithub.com/googleapis/java-shared-dependencies/issues/829)) ([add2825](https://togithub.com/googleapis/java-shared-dependencies/commit/add2825bd34cd80f529dbe0dadb3c84219177916)) - Update dependency org.threeten:threetenbp to v1.6.2 ([#​808](https://togithub.com/googleapis/java-shared-dependencies/issues/808)) ([2d2eabd](https://togithub.com/googleapis/java-shared-dependencies/commit/2d2eabd14d8150207885ea47280c0f7ff3d2962f)) - Update dependency protobuf to v3.20.2 ([#​830](https://togithub.com/googleapis/java-shared-dependencies/issues/830)) ([5afa76f](https://togithub.com/googleapis/java-shared-dependencies/commit/5afa76f9ef4705aecba49abc7bb93982fb1ecf3e)) - Update dependency protobuf to v3.20.3 ([#​839](https://togithub.com/googleapis/java-shared-dependencies/issues/839)) ([d9fc7dd](https://togithub.com/googleapis/java-shared-dependencies/commit/d9fc7ddd3e663458e6ea3f78a3c6241377df0319)) - Update dependency protobuf to v4 ([#​817](https://togithub.com/googleapis/java-shared-dependencies/issues/817)) ([ee8d154](https://togithub.com/googleapis/java-shared-dependencies/commit/ee8d154287ccd256b4dcfa48f28f5ec61a91fe3e)) - Update dependency pyjwt to v2.5.0 ([#​812](https://togithub.com/googleapis/java-shared-dependencies/issues/812)) ([4d4528e](https://togithub.com/googleapis/java-shared-dependencies/commit/4d4528e8ce269d49b99d2dbc4fcda2dc37a058cb)) - Update dependency requests to v2.28.1 ([#​813](https://togithub.com/googleapis/java-shared-dependencies/issues/813)) ([a3a8d89](https://togithub.com/googleapis/java-shared-dependencies/commit/a3a8d89b0117007a7108553c70aa82dd289e1691)) - Update dependency typing-extensions to v4.3.0 ([#​814](https://togithub.com/googleapis/java-shared-dependencies/issues/814)) ([da875e5](https://togithub.com/googleapis/java-shared-dependencies/commit/da875e5e91fa9d8c177e6c3afc9e34242eb914b7)) - Update dependency zipp to v3.8.1 ([#​815](https://togithub.com/googleapis/java-shared-dependencies/issues/815)) ([15585fd](https://togithub.com/googleapis/java-shared-dependencies/commit/15585fd0216013fe93be011f93f391f6269aa777)) - Update gax.version to v2.19.2 ([#​847](https://togithub.com/googleapis/java-shared-dependencies/issues/847)) ([c4afe1f](https://togithub.com/googleapis/java-shared-dependencies/commit/c4afe1fdc88af29ab039cea618d52c15c90e43e9)) - Update google.common-protos.version to v2.9.3 ([#​803](https://togithub.com/googleapis/java-shared-dependencies/issues/803)) ([a3e8e5e](https://togithub.com/googleapis/java-shared-dependencies/commit/a3e8e5eb53a8da14abf3b8d81a4f34fbb2f3b8f9)) - Update google.common-protos.version to v2.9.5 ([#​831](https://togithub.com/googleapis/java-shared-dependencies/issues/831)) ([1c901db](https://togithub.com/googleapis/java-shared-dependencies/commit/1c901db8a7740afaec3e809e51d4d369fbf469c4)) - Update google.common-protos.version to v2.9.6 ([#​844](https://togithub.com/googleapis/java-shared-dependencies/issues/844)) ([9e156be](https://togithub.com/googleapis/java-shared-dependencies/commit/9e156be59bd89959f04252c3045b8cd7a8be8070)) - Update google.core.version to v2.8.13 ([#​804](https://togithub.com/googleapis/java-shared-dependencies/issues/804)) ([45ae571](https://togithub.com/googleapis/java-shared-dependencies/commit/45ae57142bd6d5334eedd46243736b200a459795)) - Update google.core.version to v2.8.14 ([#​805](https://togithub.com/googleapis/java-shared-dependencies/issues/805)) ([02c9397](https://togithub.com/googleapis/java-shared-dependencies/commit/02c9397a84bf3fcca8d04e4c9867cc47689abde2)) - Update google.core.version to v2.8.15 ([#​807](https://togithub.com/googleapis/java-shared-dependencies/issues/807)) ([980856c](https://togithub.com/googleapis/java-shared-dependencies/commit/980856c43981992a3d08f69eac83aeada752d244)) - Update google.core.version to v2.8.16 ([#​810](https://togithub.com/googleapis/java-shared-dependencies/issues/810)) ([c2b2c9a](https://togithub.com/googleapis/java-shared-dependencies/commit/c2b2c9a327fd588f69524bb93a17e5d4ae8f5a42)) - Update google.core.version to v2.8.17 ([#​835](https://togithub.com/googleapis/java-shared-dependencies/issues/835)) ([3def21d](https://togithub.com/googleapis/java-shared-dependencies/commit/3def21df2e4253e3df0da064b6c4e472df079d2b)) - Update google.core.version to v2.8.18 ([#​840](https://togithub.com/googleapis/java-shared-dependencies/issues/840)) ([46566dc](https://togithub.com/googleapis/java-shared-dependencies/commit/46566dc18c4b1ed41c482b4ce21b92651e2f9dc5)) - Update google.core.version to v2.8.19 ([#​841](https://togithub.com/googleapis/java-shared-dependencies/issues/841)) ([99afde9](https://togithub.com/googleapis/java-shared-dependencies/commit/99afde97ea498f549eb75cc58c4ed88edf81b20d)) - Update google.core.version to v2.8.20 ([#​848](https://togithub.com/googleapis/java-shared-dependencies/issues/848)) ([c980c4f](https://togithub.com/googleapis/java-shared-dependencies/commit/c980c4fdfc8890d812b4881ba5b87bfd21269a5f)) - Update iam.version to v1.6.1 ([#​806](https://togithub.com/googleapis/java-shared-dependencies/issues/806)) ([a50158d](https://togithub.com/googleapis/java-shared-dependencies/commit/a50158d3b83cf8e02d8ee08c94e512b5669a927b)) - Update iam.version to v1.6.2 ([#​849](https://togithub.com/googleapis/java-shared-dependencies/issues/849)) ([e43ac96](https://togithub.com/googleapis/java-shared-dependencies/commit/e43ac96bc189a096a9311c9b03e85c86bea07e99))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90d9744fb1..3a59183a07 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.3 + 3.0.4 pom import From 4b5eadb343c90c988e4bcec24e17dc17a6ee5964 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Mon, 3 Oct 2022 16:10:19 +0000 Subject: [PATCH 052/103] fix: Get numeric value for Enum fields if it is configured as query param or path param (#1042) Get numeric value for Enum fields if it is configured as query param or path param. Refactor HttpBinding to include Field info and use builder. --- .../HttpJsonServiceStubClassComposer.java | 25 ++++- .../generator/gapic/model/HttpBindings.java | 45 +++++++-- .../gapic/protoparser/HttpRuleParser.java | 11 ++- .../HttpJsonServiceStubClassComposerTest.java | 61 +++++++++++- .../rest/goldens/ComplianceClientTest.golden | 98 ++++++++++++++++++ .../rest/goldens/ComplianceSettings.golden | 20 ++++ .../goldens/ComplianceStubSettings.golden | 50 +++++++++- .../goldens/HttpJsonComplianceStub.golden | 97 +++++++++++++++++- .../gapic/model/HttpBindingsTest.java | 99 +++++++++++++++++++ .../api/generator/gapic/model/MethodTest.java | 2 +- .../gapic/protoparser/HttpRuleParserTest.java | 83 ++++++++++++++++ src/test/proto/compliance.proto | 38 +++++++ src/test/proto/http_rule_parser_testing.proto | 63 ++++++++++++ 13 files changed, 674 insertions(+), 18 deletions(-) create mode 100644 src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java create mode 100644 src/test/proto/http_rule_parser_testing.proto diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index fa4d71498c..67e003f50f 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -59,6 +59,7 @@ import com.google.api.generator.gapic.model.OperationResponse; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableList; import com.google.protobuf.TypeRegistry; @@ -74,6 +75,7 @@ import java.util.stream.Collectors; public class HttpJsonServiceStubClassComposer extends AbstractTransportServiceStubClassComposer { + private static final HttpJsonServiceStubClassComposer INSTANCE = new HttpJsonServiceStubClassComposer(); @@ -940,9 +942,11 @@ private Expr createFieldsExtractorClassInstance( for (int i = 0; i < descendantFields.length; i++) { String currFieldName = descendantFields[i]; String bindingFieldMethodName = - (i < descendantFields.length - 1 || !httpBindingFieldName.isRepeated()) - ? String.format("get%s", JavaStyle.toUpperCamelCase(currFieldName)) - : String.format("get%sList", JavaStyle.toUpperCamelCase(currFieldName)); + getBindingFieldMethodName( + httpBindingFieldName, + descendantFields.length, + i, + JavaStyle.toUpperCamelCase(currFieldName)); requestFieldGetterExprBuilder = requestFieldGetterExprBuilder.setMethodName(bindingFieldMethodName); @@ -997,6 +1001,7 @@ private Expr createFieldsExtractorClassInstance( } } + // Add a fixed query param for numeric enum, see b/232457244 for details if (restNumericEnumsEnabled && serializerMethodName.equals("putQueryParam")) { ImmutableList.Builder paramsPutArgs = ImmutableList.builder(); @@ -1023,6 +1028,20 @@ private Expr createFieldsExtractorClassInstance( .build(); } + @VisibleForTesting + String getBindingFieldMethodName( + HttpBinding httpBindingField, int descendantFieldsLengths, int index, String currFieldName) { + if (index == descendantFieldsLengths - 1) { + if (httpBindingField.isRepeated()) { + return String.format("get%sList", currFieldName); + } + if (httpBindingField.isEnum()) { + return String.format("get%sValue", currFieldName); + } + } + return String.format("get%s", currFieldName); + } + private List getHttpMethodTypeExpr(Method protoMethod) { return Collections.singletonList( ValueExpr.withValue( diff --git a/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java b/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java index e6ecea5c94..696683cefe 100644 --- a/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java +++ b/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java @@ -36,21 +36,54 @@ public enum HttpVerb { @AutoValue public abstract static class HttpBinding implements Comparable { + + // The fully qualified name of the field. e.g. request.complex_object.another_object.name public abstract String name(); abstract String lowerCamelName(); - public abstract boolean isOptional(); + // An object that contains all info of the leaf level field + @Nullable + public abstract Field field(); - public abstract boolean isRepeated(); + public boolean isOptional() { + return field() != null && field().isProto3Optional(); + } + + public boolean isRepeated() { + return field() != null && field().isRepeated(); + } + + public boolean isEnum() { + return field() != null && field().isEnum(); + } @Nullable public abstract String valuePattern(); - public static HttpBinding create( - String name, boolean isOptional, boolean isRepeated, String valuePattern) { - return new AutoValue_HttpBindings_HttpBinding( - name, JavaStyle.toLowerCamelCase(name), isOptional, isRepeated, valuePattern); + public static HttpBindings.HttpBinding.Builder builder() { + return new AutoValue_HttpBindings_HttpBinding.Builder(); + } + + @AutoValue.Builder + public abstract static class Builder { + + public abstract HttpBindings.HttpBinding.Builder setName(String name); + + public abstract HttpBindings.HttpBinding.Builder setField(Field field); + + abstract HttpBindings.HttpBinding.Builder setLowerCamelName(String lowerCamelName); + + public abstract HttpBindings.HttpBinding.Builder setValuePattern(String valuePattern); + + abstract String name(); + + abstract HttpBindings.HttpBinding autoBuild(); + + public HttpBindings.HttpBinding build() { + setLowerCamelName(JavaStyle.toLowerCamelCase(name())); + return autoBuild(); + } } // Do not forget to keep it in sync with equals() implementation. diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java b/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java index bead11e082..87bcd76abb 100644 --- a/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java +++ b/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java @@ -82,6 +82,11 @@ private static HttpBindings parseHttpRuleHelper( Map patternSampleValues = constructPathValuePatterns(pattern); // TODO: support nested message fields bindings + // Nested message fields bindings for query params are already supported as part of + // https://github.com/googleapis/gax-java/pull/1784, + // however we need to excludes fields that are already configured for path params and body, see + // https://github.com/googleapis/googleapis/blob/532289228eaebe77c42438f74b8a5afa85fee1b6/google/api/http.proto#L208 for details, + // the current logic does not exclude fields that are more than one level deep. String body = httpRule.getBody(); Set bodyParamNames; Set queryParamNames; @@ -133,8 +138,9 @@ private static Set validateAndConstructHttpBindings( String patternSampleValue = patternSampleValues != null ? patternSampleValues.get(paramName) : null; String[] subFields = paramName.split("\\."); + HttpBinding.Builder httpBindingBuilder = HttpBinding.builder().setName(paramName); if (inputMessage == null) { - httpBindings.add(HttpBinding.create(paramName, false, false, patternSampleValue)); + httpBindings.add(httpBindingBuilder.setValuePattern(patternSampleValue).build()); continue; } Message nestedMessage = inputMessage; @@ -156,8 +162,7 @@ private static Set validateAndConstructHttpBindings( } Field field = nestedMessage.fieldMap().get(subFieldName); httpBindings.add( - HttpBinding.create( - paramName, field.isProto3Optional(), field.isRepeated(), patternSampleValue)); + httpBindingBuilder.setValuePattern(patternSampleValue).setField(field).build()); } } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java index e8eccd9eec..243ef54ce2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java @@ -14,23 +14,35 @@ package com.google.api.generator.gapic.composer.rest; +import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; 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 com.google.common.truth.Truth; import java.nio.file.Path; import java.nio.file.Paths; +import org.junit.Before; import org.junit.Test; public class HttpJsonServiceStubClassComposerTest { + + private HttpJsonServiceStubClassComposer composer; + + @Before + public void setUp() throws Exception { + composer = HttpJsonServiceStubClassComposer.instance(); + } + @Test public void generateServiceClasses() { GapicContext context = RestTestProtoLoader.instance().parseCompliance(); Service echoProtoService = context.services().get(0); - GapicClass clazz = - HttpJsonServiceStubClassComposer.instance().generate(context, echoProtoService); + GapicClass clazz = composer.generate(context, echoProtoService); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -39,4 +51,49 @@ public void generateServiceClasses() { Paths.get(Utils.getGoldenDir(this.getClass()), "HttpJsonComplianceStub.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); } + + @Test + public void + getBindingFieldMethodName_shouldReturnGetFieldListIfTheFieldIsInLastPositionAndIsRepeated() { + Field field = + Field.builder() + .setIsRepeated(true) + .setName("doesNotMatter") + .setType(TypeNode.OBJECT) + .build(); + HttpBinding httpBinding = + HttpBinding.builder().setField(field).setName("doesNotMatter").build(); + String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Values"); + Truth.assertThat(actual).isEqualTo("getValuesList"); + } + + @Test + public void + getBindingFieldMethodName_shouldReturnGetFieldValueIfTheFieldIsInLastPositionAndIsEnum() { + Field field = + Field.builder().setIsEnum(true).setName("doesNotMatter").setType(TypeNode.OBJECT).build(); + HttpBinding httpBinding = + HttpBinding.builder().setField(field).setName("doesNotMatter").build(); + String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Enums"); + Truth.assertThat(actual).isEqualTo("getEnumsValue"); + } + + @Test + public void + getBindingFieldMethodName_shouldReturnGetFieldIfTheFieldIsInLastPositionAndNotRepeatedOrEnum() { + Field field = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT).build(); + HttpBinding httpBinding = + HttpBinding.builder().setField(field).setName("doesNotMatter").build(); + String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Value"); + Truth.assertThat(actual).isEqualTo("getValue"); + } + + @Test + public void getBindingFieldMethodName_shouldReturnGetFieldIfTheFieldIsNotInLastPosition() { + Field field = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT).build(); + HttpBinding httpBinding = + HttpBinding.builder().setField(field).setName("doesNotMatter").build(); + String actual = composer.getBindingFieldMethodName(httpBinding, 4, 1, "Value"); + Truth.assertThat(actual).isEqualTo("getValue"); + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden index 9f72651e9c..07e6b442e2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden @@ -560,4 +560,102 @@ public class ComplianceClientTest { // Expected exception. } } + + @Test + public void getEnumTest() throws Exception { + EnumResponse expectedResponse = + EnumResponse.newBuilder() + .setRequest(EnumRequest.newBuilder().build()) + .setContinent(Continent.forNumber(0)) + .build(); + mockService.addResponse(expectedResponse); + + EnumRequest request = EnumRequest.newBuilder().setUnknownEnum(true).build(); + + EnumResponse actualResponse = client.getEnum(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void getEnumExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + EnumRequest request = EnumRequest.newBuilder().setUnknownEnum(true).build(); + client.getEnum(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void verifyEnumTest() throws Exception { + EnumResponse expectedResponse = + EnumResponse.newBuilder() + .setRequest(EnumRequest.newBuilder().build()) + .setContinent(Continent.forNumber(0)) + .build(); + mockService.addResponse(expectedResponse); + + EnumResponse request = + EnumResponse.newBuilder() + .setRequest(EnumRequest.newBuilder().build()) + .setContinent(Continent.forNumber(0)) + .build(); + + EnumResponse actualResponse = client.verifyEnum(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockService.getRequestPaths(); + Assert.assertEquals(1, actualRequests.size()); + + String apiClientHeaderKey = + mockService + .getRequestHeaders() + .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) + .iterator() + .next(); + Assert.assertTrue( + GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() + .matcher(apiClientHeaderKey) + .matches()); + } + + @Test + public void verifyEnumExceptionTest() throws Exception { + ApiException exception = + ApiExceptionFactory.createException( + new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); + mockService.addException(exception); + + try { + EnumResponse request = + EnumResponse.newBuilder() + .setRequest(EnumRequest.newBuilder().build()) + .setContinent(Continent.forNumber(0)) + .build(); + client.verifyEnum(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden index afa6402beb..3730206623 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden @@ -86,6 +86,16 @@ public class ComplianceSettings extends ClientSettings { return ((ComplianceStubSettings) getStubSettings()).repeatDataPathTrailingResourceSettings(); } + /** Returns the object with the settings used for calls to getEnum. */ + public UnaryCallSettings getEnumSettings() { + return ((ComplianceStubSettings) getStubSettings()).getEnumSettings(); + } + + /** Returns the object with the settings used for calls to verifyEnum. */ + public UnaryCallSettings verifyEnumSettings() { + return ((ComplianceStubSettings) getStubSettings()).verifyEnumSettings(); + } + public static final ComplianceSettings create(ComplianceStubSettings stub) throws IOException { return new ComplianceSettings.Builder(stub.toBuilder()).build(); } @@ -215,6 +225,16 @@ public class ComplianceSettings extends ClientSettings { return getStubSettingsBuilder().repeatDataPathTrailingResourceSettings(); } + /** Returns the builder for the settings used for calls to getEnum. */ + public UnaryCallSettings.Builder getEnumSettings() { + return getStubSettingsBuilder().getEnumSettings(); + } + + /** Returns the builder for the settings used for calls to verifyEnum. */ + public UnaryCallSettings.Builder verifyEnumSettings() { + return getStubSettingsBuilder().verifyEnumSettings(); + } + @Override public ComplianceSettings build() throws IOException { return new ComplianceSettings(this); diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden index f124efd10d..acd321473f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden @@ -19,6 +19,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.showcase.v1beta1.EnumRequest; +import com.google.showcase.v1beta1.EnumResponse; import com.google.showcase.v1beta1.RepeatRequest; import com.google.showcase.v1beta1.RepeatResponse; import java.io.IOException; @@ -75,6 +77,8 @@ public class ComplianceStubSettings extends StubSettings private final UnaryCallSettings repeatDataPathResourceSettings; private final UnaryCallSettings repeatDataPathTrailingResourceSettings; + private final UnaryCallSettings getEnumSettings; + private final UnaryCallSettings verifyEnumSettings; /** Returns the object with the settings used for calls to repeatDataBody. */ public UnaryCallSettings repeatDataBodySettings() { @@ -106,6 +110,16 @@ public class ComplianceStubSettings extends StubSettings return repeatDataPathTrailingResourceSettings; } + /** Returns the object with the settings used for calls to getEnum. */ + public UnaryCallSettings getEnumSettings() { + return getEnumSettings; + } + + /** Returns the object with the settings used for calls to verifyEnum. */ + public UnaryCallSettings verifyEnumSettings() { + return verifyEnumSettings; + } + public ComplianceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() @@ -189,6 +203,8 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings = settingsBuilder.repeatDataPathResourceSettings().build(); repeatDataPathTrailingResourceSettings = settingsBuilder.repeatDataPathTrailingResourceSettings().build(); + getEnumSettings = settingsBuilder.getEnumSettings().build(); + verifyEnumSettings = settingsBuilder.verifyEnumSettings().build(); } /** Builder for ComplianceStubSettings. */ @@ -204,6 +220,8 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings; private final UnaryCallSettings.Builder repeatDataPathTrailingResourceSettings; + private final UnaryCallSettings.Builder getEnumSettings; + private final UnaryCallSettings.Builder verifyEnumSettings; private static final ImmutableMap> RETRYABLE_CODE_DEFINITIONS; @@ -237,6 +255,8 @@ public class ComplianceStubSettings extends StubSettings repeatDataSimplePathSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); repeatDataPathResourceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); repeatDataPathTrailingResourceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + getEnumSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + verifyEnumSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); unaryMethodSettingsBuilders = ImmutableList.>of( @@ -245,7 +265,9 @@ public class ComplianceStubSettings extends StubSettings repeatDataQuerySettings, repeatDataSimplePathSettings, repeatDataPathResourceSettings, - repeatDataPathTrailingResourceSettings); + repeatDataPathTrailingResourceSettings, + getEnumSettings, + verifyEnumSettings); initDefaults(this); } @@ -259,6 +281,8 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings = settings.repeatDataPathResourceSettings.toBuilder(); repeatDataPathTrailingResourceSettings = settings.repeatDataPathTrailingResourceSettings.toBuilder(); + getEnumSettings = settings.getEnumSettings.toBuilder(); + verifyEnumSettings = settings.verifyEnumSettings.toBuilder(); unaryMethodSettingsBuilders = ImmutableList.>of( @@ -267,7 +291,9 @@ public class ComplianceStubSettings extends StubSettings repeatDataQuerySettings, repeatDataSimplePathSettings, repeatDataPathResourceSettings, - repeatDataPathTrailingResourceSettings); + repeatDataPathTrailingResourceSettings, + getEnumSettings, + verifyEnumSettings); } private static Builder createDefault() { @@ -314,6 +340,16 @@ public class ComplianceStubSettings extends StubSettings .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); + builder + .getEnumSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); + + builder + .verifyEnumSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); + return builder; } @@ -364,6 +400,16 @@ public class ComplianceStubSettings extends StubSettings return repeatDataPathTrailingResourceSettings; } + /** Returns the builder for the settings used for calls to getEnum. */ + public UnaryCallSettings.Builder getEnumSettings() { + return getEnumSettings; + } + + /** Returns the builder for the settings used for calls to verifyEnum. */ + public UnaryCallSettings.Builder verifyEnumSettings() { + return verifyEnumSettings; + } + @Override public ComplianceStubSettings build() throws IOException { return new ComplianceStubSettings(this); diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden index f2836caf50..bf282ba988 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden @@ -13,6 +13,8 @@ import com.google.api.gax.httpjson.ProtoRestSerializer; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; import com.google.protobuf.TypeRegistry; +import com.google.showcase.v1beta1.EnumRequest; +import com.google.showcase.v1beta1.EnumResponse; import com.google.showcase.v1beta1.RepeatRequest; import com.google.showcase.v1beta1.RepeatResponse; import java.io.IOException; @@ -168,7 +170,7 @@ public class HttpJsonComplianceStub extends ComplianceStub { serializer.putPathParam( fields, "info.fInt32", request.getInfo().getFInt32()); serializer.putPathParam( - fields, "info.fKingdom", request.getInfo().getFKingdom()); + fields, "info.fKingdom", request.getInfo().getFKingdomValue()); serializer.putPathParam( fields, "info.fString", request.getInfo().getFString()); return fields; @@ -285,12 +287,77 @@ public class HttpJsonComplianceStub extends ComplianceStub { .build()) .build(); + private static final ApiMethodDescriptor getEnumMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.showcase.v1beta1.Compliance/GetEnum") + .setHttpMethod("GET") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1beta1/compliance/enum", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = ProtoRestSerializer.create(); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "unknownEnum", request.getUnknownEnum()); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor(request -> null) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(EnumResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + + private static final ApiMethodDescriptor verifyEnumMethodDescriptor = + ApiMethodDescriptor.newBuilder() + .setFullMethodName("google.showcase.v1beta1.Compliance/VerifyEnum") + .setHttpMethod("POST") + .setType(ApiMethodDescriptor.MethodType.UNARY) + .setRequestFormatter( + ProtoMessageRequestFormatter.newBuilder() + .setPath( + "/v1beta1/compliance/enum", + request -> { + Map fields = new HashMap<>(); + ProtoRestSerializer serializer = ProtoRestSerializer.create(); + return fields; + }) + .setQueryParamsExtractor( + request -> { + Map> fields = new HashMap<>(); + ProtoRestSerializer serializer = ProtoRestSerializer.create(); + serializer.putQueryParam(fields, "continent", request.getContinentValue()); + serializer.putQueryParam(fields, "request", request.getRequest()); + serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); + return fields; + }) + .setRequestBodyExtractor(request -> null) + .build()) + .setResponseParser( + ProtoMessageResponseParser.newBuilder() + .setDefaultInstance(EnumResponse.getDefaultInstance()) + .setDefaultTypeRegistry(typeRegistry) + .build()) + .build(); + private final UnaryCallable repeatDataBodyCallable; private final UnaryCallable repeatDataBodyInfoCallable; private final UnaryCallable repeatDataQueryCallable; private final UnaryCallable repeatDataSimplePathCallable; private final UnaryCallable repeatDataPathResourceCallable; private final UnaryCallable repeatDataPathTrailingResourceCallable; + private final UnaryCallable getEnumCallable; + private final UnaryCallable verifyEnumCallable; private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; @@ -364,6 +431,16 @@ public class HttpJsonComplianceStub extends ComplianceStub { .setMethodDescriptor(repeatDataPathTrailingResourceMethodDescriptor) .setTypeRegistry(typeRegistry) .build(); + HttpJsonCallSettings getEnumTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(getEnumMethodDescriptor) + .setTypeRegistry(typeRegistry) + .build(); + HttpJsonCallSettings verifyEnumTransportSettings = + HttpJsonCallSettings.newBuilder() + .setMethodDescriptor(verifyEnumMethodDescriptor) + .setTypeRegistry(typeRegistry) + .build(); this.repeatDataBodyCallable = callableFactory.createUnaryCallable( @@ -391,6 +468,12 @@ public class HttpJsonComplianceStub extends ComplianceStub { repeatDataPathTrailingResourceTransportSettings, settings.repeatDataPathTrailingResourceSettings(), clientContext); + this.getEnumCallable = + callableFactory.createUnaryCallable( + getEnumTransportSettings, settings.getEnumSettings(), clientContext); + this.verifyEnumCallable = + callableFactory.createUnaryCallable( + verifyEnumTransportSettings, settings.verifyEnumSettings(), clientContext); this.backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources()); @@ -405,6 +488,8 @@ public class HttpJsonComplianceStub extends ComplianceStub { methodDescriptors.add(repeatDataSimplePathMethodDescriptor); methodDescriptors.add(repeatDataPathResourceMethodDescriptor); methodDescriptors.add(repeatDataPathTrailingResourceMethodDescriptor); + methodDescriptors.add(getEnumMethodDescriptor); + methodDescriptors.add(verifyEnumMethodDescriptor); return methodDescriptors; } @@ -438,6 +523,16 @@ public class HttpJsonComplianceStub extends ComplianceStub { return repeatDataPathTrailingResourceCallable; } + @Override + public UnaryCallable getEnumCallable() { + return getEnumCallable; + } + + @Override + public UnaryCallable verifyEnumCallable() { + return verifyEnumCallable; + } + @Override public final void close() { try { diff --git a/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java b/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java new file mode 100644 index 0000000000..f8713e0564 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java @@ -0,0 +1,99 @@ +// 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.model; + +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; +import com.google.common.truth.Truth; +import org.junit.Before; +import org.junit.Test; + +public class HttpBindingsTest { + + public Field.Builder fieldBuilder; + public HttpBinding.Builder httpBindingBuilder; + + @Before + public void setUp() throws Exception { + fieldBuilder = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT); + httpBindingBuilder = HttpBinding.builder().setName("doesNotMatter"); + } + + @Test + public void isOptional_shouldReturnFalseIfFieldIsNull() { + HttpBinding httpBinding = httpBindingBuilder.build(); + Truth.assertThat(httpBinding.isOptional()).isFalse(); + } + + @Test + public void isOptional_shouldReturnFalseIfFieldExistsAndIsOptionalIsFalse() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsProto3Optional(false).build()).build(); + + Truth.assertThat(httpBinding.isOptional()).isFalse(); + } + + @Test + public void isOptional_shouldReturnTrueIfFieldExistsAndIsOptionalIsTue() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsProto3Optional(true).build()).build(); + + Truth.assertThat(httpBinding.isOptional()).isTrue(); + } + + @Test + public void isRepeated_shouldReturnFalseIfFieldIsNull() { + HttpBinding httpBinding = httpBindingBuilder.build(); + Truth.assertThat(httpBinding.isRepeated()).isFalse(); + } + + @Test + public void isRepeated_shouldReturnFalseIfFieldExistsAndIsRepeatedIsFalse() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsRepeated(false).build()).build(); + + Truth.assertThat(httpBinding.isRepeated()).isFalse(); + } + + @Test + public void isRepeated_shouldReturnTrueIfFieldExistsAndIsRepeatedIsTue() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsRepeated(true).build()).build(); + + Truth.assertThat(httpBinding.isRepeated()).isTrue(); + } + + @Test + public void isEnum_shouldReturnFalseIfFieldIsNull() { + HttpBinding httpBinding = httpBindingBuilder.build(); + Truth.assertThat(httpBinding.isEnum()).isFalse(); + } + + @Test + public void isEnum_shouldReturnFalseIfFieldExistsAndIsEnumIsFalse() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsEnum(false).build()).build(); + + Truth.assertThat(httpBinding.isEnum()).isFalse(); + } + + @Test + public void isEnum_shouldReturnTrueIfFieldExistsAndIsEnumIsTue() { + HttpBinding httpBinding = + httpBindingBuilder.setField(fieldBuilder.setIsEnum(true).build()).build(); + + Truth.assertThat(httpBinding.isEnum()).isTrue(); + } +} diff --git a/src/test/java/com/google/api/generator/gapic/model/MethodTest.java b/src/test/java/com/google/api/generator/gapic/model/MethodTest.java index 93fe4b8135..cecee806f9 100644 --- a/src/test/java/com/google/api/generator/gapic/model/MethodTest.java +++ b/src/test/java/com/google/api/generator/gapic/model/MethodTest.java @@ -34,7 +34,7 @@ public class MethodTest { .build(); private static final HttpBindings HTTP_BINDINGS = HttpBindings.builder() - .setPathParameters(ImmutableSet.of(HttpBinding.create("table", true, false, ""))) + .setPathParameters(ImmutableSet.of(HttpBinding.builder().setName("table").build())) .setPattern("/pattern/test") .setAdditionalPatterns(Arrays.asList("/extra_pattern/test", "/extra_pattern/hey")) .setIsAsteriskBody(false) diff --git a/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java b/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java index 31fc531555..5269e1d982 100644 --- a/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java +++ b/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java @@ -22,12 +22,16 @@ import com.google.api.generator.gapic.model.HttpBindings; import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; import com.google.api.generator.gapic.model.Message; +import com.google.common.truth.Truth; +import com.google.http.rule.parser.HttpRuleParserTestingOuterClass; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.TestingOuterClass; +import java.util.HashSet; import java.util.Map; import java.util.stream.Collectors; +import org.junit.Ignore; import org.junit.Test; public class HttpRuleParserTest { @@ -91,4 +95,83 @@ public void parseHttpAnnotation_missingFieldFromMessage() { assertThrows( IllegalStateException.class, () -> HttpRuleParser.parse(rpcMethod, inputMessage, messages)); } + + @Test + public void + parseHttpAnnotation_shouldPutAllFieldsIntoQueryParamsIfPathParamAndBodyAreNotConfigured() { + FileDescriptor fileDescriptor = HttpRuleParserTestingOuterClass.getDescriptor(); + ServiceDescriptor serviceDescriptor = fileDescriptor.getServices().get(0); + assertEquals("HttpRuleParserTesting", serviceDescriptor.getName()); + + Map messages = Parser.parseMessages(fileDescriptor); + + MethodDescriptor rpcMethod = + serviceDescriptor.getMethods().stream() + .filter( + methodDescriptor -> methodDescriptor.getName().equals("QueryParamHappyPathTest")) + .findAny() + .get(); + Message inputMessage = messages.get("com.google.http.rule.parser.QueryParamRequest"); + HttpBindings actual = HttpRuleParser.parse(rpcMethod, inputMessage, messages); + + HttpBinding expected1 = + HttpBinding.builder().setName("name").setField(inputMessage.fieldMap().get("name")).build(); + HttpBinding expected2 = + HttpBinding.builder() + .setName("nested_object") + .setField(inputMessage.fieldMap().get("nested_object")) + .build(); + Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2); + } + + @Ignore + @Test + // request + // / \ + // nested_object name + // / \ + // name continent + // Given a request above, if nested_object.name is configured as path param, we should only + // include nested_object.continent and name as query param. + // However, the current logic put the name and the whole nested_object as query params, gax-java + // will then serialize all sub fields to query params. + // We need to either traverse all the leaf level fields and exclude field in the generator or pass + // the excluded fields to gax-java. Re-enable this test once + // https://github.com/googleapis/gapic-generator-java/issues/1041 is fixed + public void parseHttpAnnotation_shouldExcludeFieldsFromQueryParamsIfPathParamsAreConfigured() { + FileDescriptor fileDescriptor = HttpRuleParserTestingOuterClass.getDescriptor(); + ServiceDescriptor serviceDescriptor = fileDescriptor.getServices().get(0); + assertEquals("HttpRuleParserTesting", serviceDescriptor.getName()); + + Map messages = Parser.parseMessages(fileDescriptor); + + MethodDescriptor rpcMethod = + serviceDescriptor.getMethods().stream() + .filter( + methodDescriptor -> + methodDescriptor.getName().equals("ExcludePathParamsQueryParamTest")) + .findAny() + .get(); + Message inputMessage = messages.get("com.google.http.rule.parser.QueryParamRequest"); + + HttpBindings actual = HttpRuleParser.parse(rpcMethod, inputMessage, messages); + + Message nestedObjectMessage = messages.get("com.google.http.rule.parser.NestedObject"); + + HttpBinding expected1 = + HttpBinding.builder().setName("name").setField(inputMessage.fieldMap().get("name")).build(); + HttpBinding expected2 = + HttpBinding.builder() + .setName("nested_object.continent") + .setField(nestedObjectMessage.fieldMap().get("continent")) + .build(); + HttpBinding expectedPathParam = + HttpBinding.builder() + .setName("nested_object.name") + .setField(nestedObjectMessage.fieldMap().get("name")) + .build(); + + Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2); + Truth.assertThat(new HashSet<>(actual.pathParameters())).containsExactly(expectedPathParam); + } } diff --git a/src/test/proto/compliance.proto b/src/test/proto/compliance.proto index 4467a387ab..00f71a9c05 100644 --- a/src/test/proto/compliance.proto +++ b/src/test/proto/compliance.proto @@ -80,6 +80,44 @@ service Compliance { get: "/v1beta1/repeat/{info.f_string=first/*}/{info.f_child.f_string=second/**}:pathtrailingresource" }; } + + // This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the + // .proto file, or a made-up enum value the is unknown to the client. To verify that clients can round-trip unknown enum vaues they receive, use the + // response from this RPC as the request to VerifyEnum() + // + // The values of enums sent by the server when a known or unknown value is requested will be the same within a single Showcase server run (this is needed for + // VerifyEnum() to work) but are not guaranteed to be the same across separate Showcase server runs. + rpc GetEnum(EnumRequest) returns (EnumResponse) { + option (google.api.http) = { + get: "/v1beta1/compliance/enum" + }; + } + + // This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() + // verifies that its request, which is presumably the response that the client previously got to a GetEnum(), contains the correct data. If so, it responds + // with the same EnumResponse; otherwise, the RPC errors. + // + // This works because the values of enums sent by the server when a known or unknown value is requested will be the same within a single Showcase server run, + // although they are not guaranteed to be the same across separate Showcase server runs. + rpc VerifyEnum(EnumResponse) returns (EnumResponse) { + option (google.api.http) = { + post: "/v1beta1/compliance/enum" + }; + } + +} + +message EnumRequest { + // Whether the client is requesting a new, unknown enum value or a known enum value already declard in this proto file. + bool unknown_enum = 1; +} + +message EnumResponse { + // The original request for a known or unknown enum from the server. + EnumRequest request = 1; + + // The actual enum the server provided. + Continent continent = 2; } message RepeatRequest { diff --git a/src/test/proto/http_rule_parser_testing.proto b/src/test/proto/http_rule_parser_testing.proto new file mode 100644 index 0000000000..d9946e2134 --- /dev/null +++ b/src/test/proto/http_rule_parser_testing.proto @@ -0,0 +1,63 @@ +// 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 +// +// https://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. + +syntax = "proto3"; + +package google.http.rule.parser; + +import "google/api/annotations.proto"; +import "google/protobuf/empty.proto"; + +option java_package = "com.google.http.rule.parser"; +option java_multiple_files = true; + +// This service is only meant for unit testing HttpRuleParser +service HttpRuleParserTesting { + + // Test case for putting all fields to query params + rpc QueryParamHappyPathTest(QueryParamRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { + post: "/v1/test" + }; + } + + // Test case for excluding path params from query params + rpc ExcludePathParamsQueryParamTest(QueryParamRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { + post: "/v1/test/{nested_object.name}" + }; + } + + //TODO: Add more test cases once https://github.com/googleapis/gapic-generator-java/issues/1041 is fixed +} + +enum Continent { + CONTINENT_UNSPECIFIED = 0; + AFRICA = 1; + AMERICA = 2; + ANTARCTICA = 3; + AUSTRALIA = 4; + EUROPE = 5; +} + +message QueryParamRequest { + string name = 1; + NestedObject nested_object = 2; +} + +message NestedObject { + string name = 1; + Continent continent = 2; +} + From bd5599f4cc1544ad9c57fd8519707795fdf959ef Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 10 Oct 2022 16:14:31 +0200 Subject: [PATCH 053/103] chore(deps): update dependency com.google.auto.value:auto-value to v1.10 (#1058) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.value:auto-value](https://togithub.com/google/auto/tree/master/value) ([source](https://togithub.com/google/auto)) | `1.9` -> `1.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/compatibility-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/confidence-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a59183a07..705c9d8be5 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.google.auto.value auto-value - 1.9 + 1.10 From eb94f307693c02f709d10b454a22d3d773869828 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:04:21 -0400 Subject: [PATCH 054/103] fix: update sample region tag to parse host instead of proto package (#1040) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: update sample region tag to parse host instead of proto package * update goldens * update to lowerCamelCase * use explicit imports * remove setting default host where it's not needed for samples and refactor parseDefaultHost * fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#1039) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.2` -> `3.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/compatibility-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.3/confidence-slim/3.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v3.0.3`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​303-httpsgithubcomgoogleapisjava-shared-dependenciescomparev302v303-2022-09-14) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.2...v3.0.3) ##### Dependencies - Google-cloud-core 2.8.12 ([#​799](https://togithub.com/googleapis/java-shared-dependencies/issues/799)) ([1b3db8d](https://togithub.com/googleapis/java-shared-dependencies/commit/1b3db8d1e17c49ebae79fc96164fa9058e1df6e3)) - Moving gson to first-party-dependencies ([#​800](https://togithub.com/googleapis/java-shared-dependencies/issues/800)) ([a41fcc1](https://togithub.com/googleapis/java-shared-dependencies/commit/a41fcc11d32e02e5af2837561792e3919f6d4b3f)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.6 ([#​797](https://togithub.com/googleapis/java-shared-dependencies/issues/797)) ([bc5fdc9](https://togithub.com/googleapis/java-shared-dependencies/commit/bc5fdc9b3af7973c28f063a9ac156fe2af562814)) - Update gax.version to v2.19.1 ([#​798](https://togithub.com/googleapis/java-shared-dependencies/issues/798)) ([84e5487](https://togithub.com/googleapis/java-shared-dependencies/commit/84e5487b2e3dce4bb60badecebde788c3cb702b8)) - Update google.core.version to v2.8.11 ([#​793](https://togithub.com/googleapis/java-shared-dependencies/issues/793)) ([63c1297](https://togithub.com/googleapis/java-shared-dependencies/commit/63c129722aa0b821031ff5b4c11004adf7b12044))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 (#1038) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-shade-plugin)) | `3.3.0` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.0/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * update iam oneoff * linter * fix(deps): update dependency org.yaml:snakeyaml to v1.33 (#1043) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml/src) | `1.32` -> `1.33` | [![age](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/compatibility-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.yaml:snakeyaml/1.33/confidence-slim/1.32)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * refactor prepareExecutableSamples * fix imports * update name of unit test * update comment * fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#1050) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.3` -> `3.0.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/compatibility-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.4/confidence-slim/3.0.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v3.0.4`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​304-httpsgithubcomgoogleapisjava-shared-dependenciescomparev303v304-2022-10-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.3...v3.0.4) ##### Dependencies - Update dependency cachetools to v5 ([#​816](https://togithub.com/googleapis/java-shared-dependencies/issues/816)) ([3f6c408](https://togithub.com/googleapis/java-shared-dependencies/commit/3f6c408210c931c286235f61c7aadea5bf5cfe4d)) - Update dependency certifi to v2022.9.24 ([#​818](https://togithub.com/googleapis/java-shared-dependencies/issues/818)) ([5f04b97](https://togithub.com/googleapis/java-shared-dependencies/commit/5f04b97c2343146600e8c9ee65afdeb58f5743a6)) - Update dependency charset-normalizer to v2.1.1 ([#​822](https://togithub.com/googleapis/java-shared-dependencies/issues/822)) ([6997c5a](https://togithub.com/googleapis/java-shared-dependencies/commit/6997c5acad937ebe3594330de73261a424d42cf3)) - Update dependency click to v8.1.3 ([#​823](https://togithub.com/googleapis/java-shared-dependencies/issues/823)) ([42bf9f8](https://togithub.com/googleapis/java-shared-dependencies/commit/42bf9f834fdafea60f2be7ccbf7d363e058cd7c2)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.7 ([#​837](https://togithub.com/googleapis/java-shared-dependencies/issues/837)) ([d31e507](https://togithub.com/googleapis/java-shared-dependencies/commit/d31e5077c7e036de5e238e9a611df7ced527574a)) - Update dependency gcp-releasetool to v1.8.8 ([#​819](https://togithub.com/googleapis/java-shared-dependencies/issues/819)) ([8245d97](https://togithub.com/googleapis/java-shared-dependencies/commit/8245d975fb12e81454ec7664f9a7c9809bbac697)) - Update dependency gcp-releasetool to v1.8.9 ([#​846](https://togithub.com/googleapis/java-shared-dependencies/issues/846)) ([04e3283](https://togithub.com/googleapis/java-shared-dependencies/commit/04e32831c6e87c372444901013a747d2d02ce38d)) - Update dependency google-api-core to v2.10.1 ([#​824](https://togithub.com/googleapis/java-shared-dependencies/issues/824)) ([818b9aa](https://togithub.com/googleapis/java-shared-dependencies/commit/818b9aa2ac99d8b1f9b39a74b626122aed5f1d94)) - Update dependency google-auth to v2.12.0 ([#​825](https://togithub.com/googleapis/java-shared-dependencies/issues/825)) ([07c544b](https://togithub.com/googleapis/java-shared-dependencies/commit/07c544b5e0fa9f7110bbc957570f7a405962072e)) - Update dependency google-cloud-core to v2.3.2 ([#​820](https://togithub.com/googleapis/java-shared-dependencies/issues/820)) ([2a219e8](https://togithub.com/googleapis/java-shared-dependencies/commit/2a219e86f187ba5ad72f2570bd58ca6100128c43)) - Update dependency google-cloud-storage to v2.5.0 ([#​826](https://togithub.com/googleapis/java-shared-dependencies/issues/826)) ([bb10d18](https://togithub.com/googleapis/java-shared-dependencies/commit/bb10d1858a515f09d365362ffa0110a5b362c96b)) - Update dependency google-crc32c to v1.5.0 ([#​827](https://togithub.com/googleapis/java-shared-dependencies/issues/827)) ([7e5dae6](https://togithub.com/googleapis/java-shared-dependencies/commit/7e5dae60d667cb84b9ee4f6c977bdc35e79e4cf6)) - Update dependency google-resumable-media to v2.4.0 ([#​838](https://togithub.com/googleapis/java-shared-dependencies/issues/838)) ([ad82d63](https://togithub.com/googleapis/java-shared-dependencies/commit/ad82d6378f64039da383509638fb4782908eb4bc)) - Update dependency googleapis-common-protos to v1.56.4 ([#​821](https://togithub.com/googleapis/java-shared-dependencies/issues/821)) ([93d7745](https://togithub.com/googleapis/java-shared-dependencies/commit/93d77458c9bbf84ec367cdb4caaa41e6f71675c6)) - Update dependency importlib-metadata to v4.12.0 ([#​832](https://togithub.com/googleapis/java-shared-dependencies/issues/832)) ([ee19fb1](https://togithub.com/googleapis/java-shared-dependencies/commit/ee19fb1ca5a2a2e1985297e3b72d44de68bc72e3)) - Update dependency importlib-metadata to v4.13.0 ([#​843](https://togithub.com/googleapis/java-shared-dependencies/issues/843)) ([d2ede60](https://togithub.com/googleapis/java-shared-dependencies/commit/d2ede601eee8c875780c7eb5924623537480c509)) - Update dependency importlib-metadata to v5 ([#​845](https://togithub.com/googleapis/java-shared-dependencies/issues/845)) ([03ac7e8](https://togithub.com/googleapis/java-shared-dependencies/commit/03ac7e800274c5f58d2bc4ddd0561bfcdea1bb27)) - Update dependency io.grpc:grpc-bom to v1.49.1 ([#​802](https://togithub.com/googleapis/java-shared-dependencies/issues/802)) ([b8c54bf](https://togithub.com/googleapis/java-shared-dependencies/commit/b8c54bf8f1ddecc788cee151f8afe42de45bdc9d)) - Update dependency io.grpc:grpc-bom to v1.49.2 ([#​842](https://togithub.com/googleapis/java-shared-dependencies/issues/842)) ([1b1cfa2](https://togithub.com/googleapis/java-shared-dependencies/commit/1b1cfa27d05f7732da12721305cf41dcbebda232)) - Update dependency jeepney to v0.8.0 ([#​833](https://togithub.com/googleapis/java-shared-dependencies/issues/833)) ([15d2f9f](https://togithub.com/googleapis/java-shared-dependencies/commit/15d2f9f52b5a3259db0813df3d2424e256ccb372)) - Update dependency jinja2 to v3.1.2 ([#​834](https://togithub.com/googleapis/java-shared-dependencies/issues/834)) ([c188f95](https://togithub.com/googleapis/java-shared-dependencies/commit/c188f95acdb3349f1c4b3ed56e5fffb75e8fbc8d)) - Update dependency keyring to v23.9.3 ([#​828](https://togithub.com/googleapis/java-shared-dependencies/issues/828)) ([b185aaa](https://togithub.com/googleapis/java-shared-dependencies/commit/b185aaae716d4d97cb64f0426cac0e778f11223d)) - Update dependency markupsafe to v2.1.1 ([#​829](https://togithub.com/googleapis/java-shared-dependencies/issues/829)) ([add2825](https://togithub.com/googleapis/java-shared-dependencies/commit/add2825bd34cd80f529dbe0dadb3c84219177916)) - Update dependency org.threeten:threetenbp to v1.6.2 ([#​808](https://togithub.com/googleapis/java-shared-dependencies/issues/808)) ([2d2eabd](https://togithub.com/googleapis/java-shared-dependencies/commit/2d2eabd14d8150207885ea47280c0f7ff3d2962f)) - Update dependency protobuf to v3.20.2 ([#​830](https://togithub.com/googleapis/java-shared-dependencies/issues/830)) ([5afa76f](https://togithub.com/googleapis/java-shared-dependencies/commit/5afa76f9ef4705aecba49abc7bb93982fb1ecf3e)) - Update dependency protobuf to v3.20.3 ([#​839](https://togithub.com/googleapis/java-shared-dependencies/issues/839)) ([d9fc7dd](https://togithub.com/googleapis/java-shared-dependencies/commit/d9fc7ddd3e663458e6ea3f78a3c6241377df0319)) - Update dependency protobuf to v4 ([#​817](https://togithub.com/googleapis/java-shared-dependencies/issues/817)) ([ee8d154](https://togithub.com/googleapis/java-shared-dependencies/commit/ee8d154287ccd256b4dcfa48f28f5ec61a91fe3e)) - Update dependency pyjwt to v2.5.0 ([#​812](https://togithub.com/googleapis/java-shared-dependencies/issues/812)) ([4d4528e](https://togithub.com/googleapis/java-shared-dependencies/commit/4d4528e8ce269d49b99d2dbc4fcda2dc37a058cb)) - Update dependency requests to v2.28.1 ([#​813](https://togithub.com/googleapis/java-shared-dependencies/issues/813)) ([a3a8d89](https://togithub.com/googleapis/java-shared-dependencies/commit/a3a8d89b0117007a7108553c70aa82dd289e1691)) - Update dependency typing-extensions to v4.3.0 ([#​814](https://togithub.com/googleapis/java-shared-dependencies/issues/814)) ([da875e5](https://togithub.com/googleapis/java-shared-dependencies/commit/da875e5e91fa9d8c177e6c3afc9e34242eb914b7)) - Update dependency zipp to v3.8.1 ([#​815](https://togithub.com/googleapis/java-shared-dependencies/issues/815)) ([15585fd](https://togithub.com/googleapis/java-shared-dependencies/commit/15585fd0216013fe93be011f93f391f6269aa777)) - Update gax.version to v2.19.2 ([#​847](https://togithub.com/googleapis/java-shared-dependencies/issues/847)) ([c4afe1f](https://togithub.com/googleapis/java-shared-dependencies/commit/c4afe1fdc88af29ab039cea618d52c15c90e43e9)) - Update google.common-protos.version to v2.9.3 ([#​803](https://togithub.com/googleapis/java-shared-dependencies/issues/803)) ([a3e8e5e](https://togithub.com/googleapis/java-shared-dependencies/commit/a3e8e5eb53a8da14abf3b8d81a4f34fbb2f3b8f9)) - Update google.common-protos.version to v2.9.5 ([#​831](https://togithub.com/googleapis/java-shared-dependencies/issues/831)) ([1c901db](https://togithub.com/googleapis/java-shared-dependencies/commit/1c901db8a7740afaec3e809e51d4d369fbf469c4)) - Update google.common-protos.version to v2.9.6 ([#​844](https://togithub.com/googleapis/java-shared-dependencies/issues/844)) ([9e156be](https://togithub.com/googleapis/java-shared-dependencies/commit/9e156be59bd89959f04252c3045b8cd7a8be8070)) - Update google.core.version to v2.8.13 ([#​804](https://togithub.com/googleapis/java-shared-dependencies/issues/804)) ([45ae571](https://togithub.com/googleapis/java-shared-dependencies/commit/45ae57142bd6d5334eedd46243736b200a459795)) - Update google.core.version to v2.8.14 ([#​805](https://togithub.com/googleapis/java-shared-dependencies/issues/805)) ([02c9397](https://togithub.com/googleapis/java-shared-dependencies/commit/02c9397a84bf3fcca8d04e4c9867cc47689abde2)) - Update google.core.version to v2.8.15 ([#​807](https://togithub.com/googleapis/java-shared-dependencies/issues/807)) ([980856c](https://togithub.com/googleapis/java-shared-dependencies/commit/980856c43981992a3d08f69eac83aeada752d244)) - Update google.core.version to v2.8.16 ([#​810](https://togithub.com/googleapis/java-shared-dependencies/issues/810)) ([c2b2c9a](https://togithub.com/googleapis/java-shared-dependencies/commit/c2b2c9a327fd588f69524bb93a17e5d4ae8f5a42)) - Update google.core.version to v2.8.17 ([#​835](https://togithub.com/googleapis/java-shared-dependencies/issues/835)) ([3def21d](https://togithub.com/googleapis/java-shared-dependencies/commit/3def21df2e4253e3df0da064b6c4e472df079d2b)) - Update google.core.version to v2.8.18 ([#​840](https://togithub.com/googleapis/java-shared-dependencies/issues/840)) ([46566dc](https://togithub.com/googleapis/java-shared-dependencies/commit/46566dc18c4b1ed41c482b4ce21b92651e2f9dc5)) - Update google.core.version to v2.8.19 ([#​841](https://togithub.com/googleapis/java-shared-dependencies/issues/841)) ([99afde9](https://togithub.com/googleapis/java-shared-dependencies/commit/99afde97ea498f549eb75cc58c4ed88edf81b20d)) - Update google.core.version to v2.8.20 ([#​848](https://togithub.com/googleapis/java-shared-dependencies/issues/848)) ([c980c4f](https://togithub.com/googleapis/java-shared-dependencies/commit/c980c4fdfc8890d812b4881ba5b87bfd21269a5f)) - Update iam.version to v1.6.1 ([#​806](https://togithub.com/googleapis/java-shared-dependencies/issues/806)) ([a50158d](https://togithub.com/googleapis/java-shared-dependencies/commit/a50158d3b83cf8e02d8ee08c94e512b5669a927b)) - Update iam.version to v1.6.2 ([#​849](https://togithub.com/googleapis/java-shared-dependencies/issues/849)) ([e43ac96](https://togithub.com/googleapis/java-shared-dependencies/commit/e43ac96bc189a096a9311c9b03e85c86bea07e99))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * fix: Get numeric value for Enum fields if it is configured as query param or path param (#1042) Get numeric value for Enum fields if it is configured as query param or path param. Refactor HttpBinding to include Field info and use builder. * refactor unit tests * refactor composers * chore(deps): update dependency com.google.auto.value:auto-value to v1.10 (#1058) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.value:auto-value](https://togithub.com/google/auto/tree/master/value) ([source](https://togithub.com/google/auto)) | `1.9` -> `1.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/compatibility-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/confidence-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * update comment * fix lint Co-authored-by: WhiteSource Renovate Co-authored-by: Blake Li --- .../generator/gapic/composer/Composer.java | 60 +++++++--- .../AbstractServiceClientClassComposer.java | 3 +- .../AbstractServiceSettingsClassComposer.java | 3 +- ...tractServiceStubSettingsClassComposer.java | 3 +- .../samplecode/SettingsSampleComposer.java | 1 + .../api/generator/gapic/model/GapicClass.java | 14 ++- .../api/generator/gapic/model/RegionTag.java | 1 + .../gapic/composer/ComposerTest.java | 112 +++++++++++++----- .../grpc/ServiceClientClassComposerTest.java | 33 ++++-- .../ServiceSettingsClassComposerTest.java | 12 +- .../grpc/ServiceStubClassComposerTest.java | 8 +- .../ServiceStubSettingsClassComposerTest.java | 26 +++- .../AsyncAnalyzeIamPolicy.java | 4 +- .../SyncAnalyzeIamPolicy.java | 4 +- .../AsyncAnalyzeIamPolicyLongrunning.java | 4 +- .../AsyncAnalyzeIamPolicyLongrunningLRO.java | 4 +- .../SyncAnalyzeIamPolicyLongrunning.java | 4 +- .../analyzemove/AsyncAnalyzeMove.java | 4 +- .../analyzemove/SyncAnalyzeMove.java | 4 +- .../AsyncBatchGetAssetsHistory.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createfeed/AsyncCreateFeed.java | 4 +- .../createfeed/SyncCreateFeed.java | 4 +- .../createfeed/SyncCreateFeedString.java | 4 +- .../deletefeed/AsyncDeleteFeed.java | 4 +- .../deletefeed/SyncDeleteFeed.java | 4 +- .../deletefeed/SyncDeleteFeedFeedname.java | 4 +- .../deletefeed/SyncDeleteFeedString.java | 4 +- .../exportassets/AsyncExportAssets.java | 4 +- .../exportassets/AsyncExportAssetsLRO.java | 4 +- .../exportassets/SyncExportAssets.java | 4 +- .../getfeed/AsyncGetFeed.java | 4 +- .../getfeed/SyncGetFeed.java | 4 +- .../getfeed/SyncGetFeedFeedname.java | 4 +- .../getfeed/SyncGetFeedString.java | 4 +- .../listassets/AsyncListAssets.java | 4 +- .../listassets/AsyncListAssetsPaged.java | 4 +- .../listassets/SyncListAssets.java | 4 +- .../SyncListAssetsResourcename.java | 4 +- .../listassets/SyncListAssetsString.java | 4 +- .../listfeeds/AsyncListFeeds.java | 4 +- .../listfeeds/SyncListFeeds.java | 4 +- .../listfeeds/SyncListFeedsString.java | 4 +- .../AsyncSearchAllIamPolicies.java | 4 +- .../AsyncSearchAllIamPoliciesPaged.java | 4 +- .../SyncSearchAllIamPolicies.java | 4 +- .../SyncSearchAllIamPoliciesStringString.java | 4 +- .../AsyncSearchAllResources.java | 4 +- .../AsyncSearchAllResourcesPaged.java | 4 +- .../SyncSearchAllResources.java | 4 +- ...rchAllResourcesStringStringListstring.java | 4 +- .../updatefeed/AsyncUpdateFeed.java | 4 +- .../updatefeed/SyncUpdateFeed.java | 4 +- .../updatefeed/SyncUpdateFeedFeed.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../AsyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- ...countnameListstringListstringDuration.java | 4 +- ...kenStringListstringListstringDuration.java | 4 +- .../generateidtoken/AsyncGenerateIdToken.java | 4 +- .../generateidtoken/SyncGenerateIdToken.java | 4 +- ...iceaccountnameListstringStringBoolean.java | 4 +- ...eIdTokenStringListstringStringBoolean.java | 4 +- .../signblob/AsyncSignBlob.java | 4 +- .../signblob/SyncSignBlob.java | 4 +- ...erviceaccountnameListstringBytestring.java | 4 +- ...yncSignBlobStringListstringBytestring.java | 4 +- .../signjwt/AsyncSignJwt.java | 4 +- .../signjwt/SyncSignJwt.java | 4 +- ...JwtServiceaccountnameListstringString.java | 4 +- .../SyncSignJwtStringListstringString.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- .../AsyncAsymmetricDecrypt.java | 4 +- .../SyncAsymmetricDecrypt.java | 4 +- ...DecryptCryptokeyversionnameBytestring.java | 4 +- ...SyncAsymmetricDecryptStringBytestring.java | 4 +- .../asymmetricsign/AsyncAsymmetricSign.java | 4 +- .../asymmetricsign/SyncAsymmetricSign.java | 4 +- ...mmetricSignCryptokeyversionnameDigest.java | 4 +- .../SyncAsymmetricSignStringDigest.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createcryptokey/AsyncCreateCryptoKey.java | 4 +- .../createcryptokey/SyncCreateCryptoKey.java | 4 +- ...teCryptoKeyKeyringnameStringCryptokey.java | 4 +- ...cCreateCryptoKeyStringStringCryptokey.java | 4 +- .../AsyncCreateCryptoKeyVersion.java | 4 +- .../SyncCreateCryptoKeyVersion.java | 4 +- ...yVersionCryptokeynameCryptokeyversion.java | 4 +- ...ryptoKeyVersionStringCryptokeyversion.java | 4 +- .../createimportjob/AsyncCreateImportJob.java | 4 +- .../createimportjob/SyncCreateImportJob.java | 4 +- ...teImportJobKeyringnameStringImportjob.java | 4 +- ...cCreateImportJobStringStringImportjob.java | 4 +- .../createkeyring/AsyncCreateKeyRing.java | 4 +- .../createkeyring/SyncCreateKeyRing.java | 4 +- ...reateKeyRingLocationnameStringKeyring.java | 4 +- .../SyncCreateKeyRingStringStringKeyring.java | 4 +- .../decrypt/AsyncDecrypt.java | 4 +- .../decrypt/SyncDecrypt.java | 4 +- .../SyncDecryptCryptokeynameBytestring.java | 4 +- .../decrypt/SyncDecryptStringBytestring.java | 4 +- .../AsyncDestroyCryptoKeyVersion.java | 4 +- .../SyncDestroyCryptoKeyVersion.java | 4 +- ...yCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncDestroyCryptoKeyVersionString.java | 4 +- .../encrypt/AsyncEncrypt.java | 4 +- .../encrypt/SyncEncrypt.java | 4 +- .../SyncEncryptResourcenameBytestring.java | 4 +- .../encrypt/SyncEncryptStringBytestring.java | 4 +- .../getcryptokey/AsyncGetCryptoKey.java | 4 +- .../getcryptokey/SyncGetCryptoKey.java | 4 +- .../SyncGetCryptoKeyCryptokeyname.java | 4 +- .../getcryptokey/SyncGetCryptoKeyString.java | 4 +- .../AsyncGetCryptoKeyVersion.java | 4 +- .../SyncGetCryptoKeyVersion.java | 4 +- ...tCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncGetCryptoKeyVersionString.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getimportjob/AsyncGetImportJob.java | 4 +- .../getimportjob/SyncGetImportJob.java | 4 +- .../SyncGetImportJobImportjobname.java | 4 +- .../getimportjob/SyncGetImportJobString.java | 4 +- .../getkeyring/AsyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRingKeyringname.java | 4 +- .../getkeyring/SyncGetKeyRingString.java | 4 +- .../getlocation/AsyncGetLocation.java | 4 +- .../getlocation/SyncGetLocation.java | 4 +- .../getpublickey/AsyncGetPublicKey.java | 4 +- .../getpublickey/SyncGetPublicKey.java | 4 +- .../SyncGetPublicKeyCryptokeyversionname.java | 4 +- .../getpublickey/SyncGetPublicKeyString.java | 4 +- .../AsyncImportCryptoKeyVersion.java | 4 +- .../SyncImportCryptoKeyVersion.java | 4 +- .../listcryptokeys/AsyncListCryptoKeys.java | 4 +- .../AsyncListCryptoKeysPaged.java | 4 +- .../listcryptokeys/SyncListCryptoKeys.java | 4 +- .../SyncListCryptoKeysKeyringname.java | 4 +- .../SyncListCryptoKeysString.java | 4 +- .../AsyncListCryptoKeyVersions.java | 4 +- .../AsyncListCryptoKeyVersionsPaged.java | 4 +- .../SyncListCryptoKeyVersions.java | 4 +- ...yncListCryptoKeyVersionsCryptokeyname.java | 4 +- .../SyncListCryptoKeyVersionsString.java | 4 +- .../listimportjobs/AsyncListImportJobs.java | 4 +- .../AsyncListImportJobsPaged.java | 4 +- .../listimportjobs/SyncListImportJobs.java | 4 +- .../SyncListImportJobsKeyringname.java | 4 +- .../SyncListImportJobsString.java | 4 +- .../listkeyrings/AsyncListKeyRings.java | 4 +- .../listkeyrings/AsyncListKeyRingsPaged.java | 4 +- .../listkeyrings/SyncListKeyRings.java | 4 +- .../SyncListKeyRingsLocationname.java | 4 +- .../listkeyrings/SyncListKeyRingsString.java | 4 +- .../listlocations/AsyncListLocations.java | 4 +- .../AsyncListLocationsPaged.java | 4 +- .../listlocations/SyncListLocations.java | 4 +- .../AsyncRestoreCryptoKeyVersion.java | 4 +- .../SyncRestoreCryptoKeyVersion.java | 4 +- ...eCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncRestoreCryptoKeyVersionString.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatecryptokey/AsyncUpdateCryptoKey.java | 4 +- .../updatecryptokey/SyncUpdateCryptoKey.java | 4 +- ...SyncUpdateCryptoKeyCryptokeyFieldmask.java | 4 +- .../AsyncUpdateCryptoKeyPrimaryVersion.java | 4 +- .../SyncUpdateCryptoKeyPrimaryVersion.java | 4 +- ...oKeyPrimaryVersionCryptokeynameString.java | 4 +- ...teCryptoKeyPrimaryVersionStringString.java | 4 +- .../AsyncUpdateCryptoKeyVersion.java | 4 +- .../SyncUpdateCryptoKeyVersion.java | 4 +- ...toKeyVersionCryptokeyversionFieldmask.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbook/AsyncCreateBook.java | 4 +- .../createbook/SyncCreateBook.java | 4 +- .../SyncCreateBookShelfnameBook.java | 4 +- .../createbook/SyncCreateBookStringBook.java | 4 +- .../createshelf/AsyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelfShelf.java | 4 +- .../deletebook/AsyncDeleteBook.java | 4 +- .../deletebook/SyncDeleteBook.java | 4 +- .../deletebook/SyncDeleteBookBookname.java | 4 +- .../deletebook/SyncDeleteBookString.java | 4 +- .../deleteshelf/AsyncDeleteShelf.java | 4 +- .../deleteshelf/SyncDeleteShelf.java | 4 +- .../deleteshelf/SyncDeleteShelfShelfname.java | 4 +- .../deleteshelf/SyncDeleteShelfString.java | 4 +- .../getbook/AsyncGetBook.java | 4 +- .../getbook/SyncGetBook.java | 4 +- .../getbook/SyncGetBookBookname.java | 4 +- .../getbook/SyncGetBookString.java | 4 +- .../getshelf/AsyncGetShelf.java | 4 +- .../getshelf/SyncGetShelf.java | 4 +- .../getshelf/SyncGetShelfShelfname.java | 4 +- .../getshelf/SyncGetShelfString.java | 4 +- .../listbooks/AsyncListBooks.java | 4 +- .../listbooks/AsyncListBooksPaged.java | 4 +- .../listbooks/SyncListBooks.java | 4 +- .../listbooks/SyncListBooksShelfname.java | 4 +- .../listbooks/SyncListBooksString.java | 4 +- .../listshelves/AsyncListShelves.java | 4 +- .../listshelves/AsyncListShelvesPaged.java | 4 +- .../listshelves/SyncListShelves.java | 4 +- .../mergeshelves/AsyncMergeShelves.java | 4 +- .../mergeshelves/SyncMergeShelves.java | 4 +- .../SyncMergeShelvesShelfnameShelfname.java | 4 +- .../SyncMergeShelvesShelfnameString.java | 4 +- .../SyncMergeShelvesStringShelfname.java | 4 +- .../SyncMergeShelvesStringString.java | 4 +- .../movebook/AsyncMoveBook.java | 4 +- .../movebook/SyncMoveBook.java | 4 +- .../SyncMoveBookBooknameShelfname.java | 4 +- .../movebook/SyncMoveBookBooknameString.java | 4 +- .../movebook/SyncMoveBookStringShelfname.java | 4 +- .../movebook/SyncMoveBookStringString.java | 4 +- .../updatebook/AsyncUpdateBook.java | 4 +- .../updatebook/SyncUpdateBook.java | 4 +- .../SyncUpdateBookBookFieldmask.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- 233 files changed, 650 insertions(+), 510 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 8306930de1..60d4f5dde2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic.composer; import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.gapic.composer.comment.CommentComposer; import com.google.api.generator.gapic.composer.grpc.GrpcServiceCallableFactoryClassComposer; import com.google.api.generator.gapic.composer.grpc.GrpcServiceStubClassComposer; @@ -36,6 +37,8 @@ import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.model.Transport; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -191,36 +194,57 @@ public static List generateTestClasses(GapicContext context) { @VisibleForTesting static List prepareExecutableSamples(List clazzes, String protoPackage) { - // parse protoPackage for apiVersion and apiShortName + // parse protoPackage for apiVersion String[] pakkage = protoPackage.split("\\."); String apiVersion; - String apiShortName; // e.g. v1, v2, v1beta1 if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { apiVersion = pakkage[pakkage.length - 1]; - apiShortName = pakkage[pakkage.length - 2]; } else { apiVersion = ""; - apiShortName = pakkage[pakkage.length - 1]; } - // Include license header, apiShortName, and apiVersion - return clazzes.stream() - .map( - gapicClass -> { - List samples = - gapicClass.samples().stream() - .map( - sample -> addRegionTagAndHeaderToSample(sample, apiShortName, apiVersion)) - .collect(Collectors.toList()); - return gapicClass.withSamples(samples); - }) - .collect(Collectors.toList()); + // Include license header, apiShortName, and apiVersion + List clazzesWithSamples = new ArrayList<>(); + clazzes.forEach( + gapicClass -> { + List samples = new ArrayList<>(); + gapicClass + .samples() + .forEach( + sample -> + samples.add( + addRegionTagAndHeaderToSample( + sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion))); + clazzesWithSamples.add(gapicClass.withSamples(samples)); + }); + return clazzesWithSamples; } - private static Sample addRegionTagAndHeaderToSample( + // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default + // endpoints like + // "us-east1-pubsub.googleapis.com". + @VisibleForTesting + protected static String parseDefaultHost(String defaultHost) { + // If the defaultHost is of the format "**.googleapis.com", take the name before the first + // period. + String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); + // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the + // first period and after the last dash to follow CSharp's implementation here: + // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 + apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); + // `iam-meta-api` service is an exceptional case and is handled as a one-off + if (defaultHost.contains("iam-meta-api")) { + apiShortName = "iam"; + } + return apiShortName; + } + + @VisibleForTesting + protected static Sample addRegionTagAndHeaderToSample( Sample sample, String apiShortName, String apiVersion) { + final List header = Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT); return sample - .withHeader(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT)) + .withHeader(header) .withRegionTag( sample.regionTag().withApiVersion(apiVersion).withApiShortName(apiShortName)); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index cf99df8d15..c76f25c9f6 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -163,7 +163,8 @@ public GapicClass generate(GapicContext context, Service service) { .build(); updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames); - return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); + return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) + .withDefaultHost(service.defaultHost()); } private static List createClassAnnotations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java index 68780ed6bc..08186862ae 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java @@ -126,7 +126,8 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, typeStore)) .setNestedClasses(Arrays.asList(createNestedBuilderClass(service, typeStore))) .build(); - return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); + return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) + .withDefaultHost(service.defaultHost()); } private static List createClassHeaderComments( diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index 1074173850..cea124e96d 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -201,7 +201,8 @@ public GapicClass generate(GapicContext context, Service service) { Arrays.asList(createNestedBuilderClass(service, serviceConfig, typeStore))) .build(); return GapicClass.create( - GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); + GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) + .withDefaultHost(service.defaultHost()); } protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java index 9027f50000..372399ee56 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java @@ -145,6 +145,7 @@ public static Optional composeSettingsSample( .map(e -> ExprStatement.withExpr(e)) .collect(Collectors.toList()); + // TODO: alicejli edit RegionTag to match other languages RegionTag regionTag = RegionTag.builder() .setServiceName(classType.reference().name()) diff --git a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java index eee6349fa8..165cb4d94b 100644 --- a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java +++ b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java @@ -35,6 +35,10 @@ public enum Kind { public abstract List samples(); + // Represents the host URL for the service. May or may not contain a regional endpoint. Only used + // for generating the region tag for samples; therefore only used in select Composers. + public abstract String defaultHost(); + public static GapicClass create(Kind kind, ClassDefinition classDefinition) { return builder().setKind(kind).setClassDefinition(classDefinition).build(); } @@ -45,7 +49,9 @@ public static GapicClass create( } static Builder builder() { - return new AutoValue_GapicClass.Builder().setSamples(Collections.emptyList()); + return new AutoValue_GapicClass.Builder() + .setSamples(Collections.emptyList()) + .setDefaultHost(""); } abstract Builder toBuilder(); @@ -54,6 +60,10 @@ public final GapicClass withSamples(List samples) { return toBuilder().setSamples(samples).build(); } + public final GapicClass withDefaultHost(String defaultHost) { + return toBuilder().setDefaultHost(defaultHost).build(); + } + @AutoValue.Builder abstract static class Builder { abstract Builder setKind(Kind kind); @@ -62,6 +72,8 @@ abstract static class Builder { abstract Builder setSamples(List samples); + abstract Builder setDefaultHost(String defaultHost); + abstract GapicClass build(); } } diff --git a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java index d98212ef6b..29bb98eeef 100644 --- a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java +++ b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java @@ -20,6 +20,7 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +// TODO: alicejli edit RegionTag to match other languages /** * This model represents a code sample region tag. Matching region start and end region tag comments * are used to determine the boundaries of code snippets to be used in documentation. diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java index 4bbc779dcf..caf070682c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java @@ -15,6 +15,7 @@ package com.google.api.generator.gapic.composer; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.ScopeNode; @@ -25,11 +26,11 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.Sample; 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 com.google.common.collect.ImmutableList; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; @@ -42,8 +43,13 @@ public class ComposerTest { private final List clazzes = Arrays.asList( GrpcServiceCallableFactoryClassComposer.instance().generate(context, echoProtoService)); - private final String protoPackage = context.gapicMetadata().getProtoPackage(); - private final List samples = clazzes.get(0).samples(); + private final Sample sample = + Sample.builder() + .setRegionTag( + RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build()) + .build(); + private List ListofSamples = Arrays.asList(new Sample[] {sample}); + private final String protoPackage = echoProtoService.protoPakkage(); @Test public void gapicClass_addApacheLicense() { @@ -65,58 +71,102 @@ public void gapicClass_addApacheLicense() { @Test public void composeSamples_showcase() { - for (Sample sample : samples) { - assertEquals( - "File header will be empty before composing samples", - sample.fileHeader(), - ImmutableList.of()); - assertEquals( - "ApiShortName will be empty before composing samples", - sample.regionTag().apiShortName(), - ""); - assertEquals( - "ApiVersion will be empty before composing samples", sample.regionTag().apiVersion(), ""); - } + GapicClass testClass = clazzes.get(0).withSamples(ListofSamples); + List testClassList = Arrays.asList(new GapicClass[] {testClass}); List composedSamples = - Composer.prepareExecutableSamples(clazzes, protoPackage).get(0).samples(); + Composer.prepareExecutableSamples(testClassList, protoPackage).get(0).samples(); + assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { assertEquals( - "File header should be apache", - sample.fileHeader(), - Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT)); - assertEquals( - "ApiShortName should be showcase", sample.regionTag().apiShortName(), "showcase"); - assertEquals("ApiVersion should be v1beta1", sample.regionTag().apiVersion(), "v1beta1"); + "File header should be APACHE", + Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), + sample.fileHeader()); + assertEquals("ApiShortName should be empty", "", sample.regionTag().apiShortName()); + assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion()); } } + @Test + public void parseDefaultHost_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { + String defaultHost = "us-east1-pubsub.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("pubsub", apiShortName); + } + + @Test + public void parseDefaultHost_shouldReturnApiShortName() { + String defaultHost = "logging.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("logging", apiShortName); + } + + @Test + public void parseDefaultHost_shouldReturnApiShortNameForIam() { + String defaultHost = "iam-meta-api.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("iam", apiShortName); + } + + @Test + public void parseDefaultHost_shouldReturnHostIfNoPeriods() { + String defaultHost = "logging:7469"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("logging:7469", apiShortName); + } + + @Test + public void gapicClass_addRegionTagAndHeaderToSample() { + Sample testSample; + testSample = Composer.addRegionTagAndHeaderToSample(sample, "showcase", "v1"); + assertEquals("Showcase", testSample.regionTag().apiShortName()); + assertEquals("V1", testSample.regionTag().apiVersion()); + assertEquals(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), testSample.fileHeader()); + } + @Test public void composeSamples_parseProtoPackage() { + + String defaultHost = "accessapproval.googleapis.com:443"; + GapicClass testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); + List testClassList = Arrays.asList(new GapicClass[] {testClass}); String protoPack = "google.cloud.accessapproval.v1"; + List composedSamples = - Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); + Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + + // If samples is empty, the test automatically passes without checking. + assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { assertEquals( - "ApiShortName should be accessapproval", + "ApiShortName should be Accessapproval", sample.regionTag().apiShortName(), - "accessapproval"); - assertEquals("ApiVersion should be v1", sample.regionTag().apiVersion(), "v1"); + "Accessapproval"); + assertEquals("ApiVersion should be V1", sample.regionTag().apiVersion(), "V1"); } protoPack = "google.cloud.vision.v1p1beta1"; - composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); + defaultHost = "vision.googleapis.com"; + testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); + testClassList = Arrays.asList(new GapicClass[] {testClass}); + composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + // If samples is empty, the test automatically passes without checking. + assertFalse(composedSamples.isEmpty()); + for (Sample sample : composedSamples) { - assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision"); - assertEquals("ApiVersion should be v1p1beta1", sample.regionTag().apiVersion(), "v1p1beta1"); + assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision"); + assertEquals("ApiVersion should be V1P1Beta1", sample.regionTag().apiVersion(), "V1P1Beta1"); } protoPack = "google.cloud.vision"; - composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); + composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + // If samples is empty, the test automatically passes without checking. + assertFalse(composedSamples.isEmpty()); + for (Sample sample : composedSamples) { - assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision"); + assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision"); assertEquals("ApiVersion should be empty", sample.regionTag().apiVersion(), ""); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java index fe00c3ca04..18450c1ca8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java @@ -18,8 +18,7 @@ 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 java.util.Arrays; -import java.util.Collection; +import java.util.*; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -30,11 +29,27 @@ public class ServiceClientClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoClient", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, - {"DeprecatedServiceClient", GrpcTestProtoLoader.instance().parseDeprecatedService()}, - {"IdentityClient", GrpcTestProtoLoader.instance().parseShowcaseIdentity()}, - {"BookshopClient", GrpcTestProtoLoader.instance().parseBookshopService()}, - {"MessagingClient", GrpcTestProtoLoader.instance().parseShowcaseMessaging()}, + {"EchoClient", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "DeprecatedServiceClient", + GrpcTestProtoLoader.instance().parseDeprecatedService(), + "localhost:7469" + }, + { + "IdentityClient", + GrpcTestProtoLoader.instance().parseShowcaseIdentity(), + "localhost:7469" + }, + { + "BookshopClient", + GrpcTestProtoLoader.instance().parseBookshopService(), + "localhost:2665" + }, + { + "MessagingClient", + GrpcTestProtoLoader.instance().parseShowcaseMessaging(), + "localhost:7469" + }, }); } @@ -43,6 +58,9 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; + @Parameterized.Parameter(2) + public String defaultHostExpected; + @Test public void generateServiceClientClasses() { Service service = context.services().get(0); @@ -51,5 +69,6 @@ public void generateServiceClientClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertGoldenSamples( this.getClass(), name, clazz.classDefinition().packageString(), clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java index 5857ef3352..7f59ac58d0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java @@ -31,8 +31,12 @@ public class ServiceSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoSettings", TestProtoLoader.instance().parseShowcaseEcho()}, - {"DeprecatedServiceSettings", TestProtoLoader.instance().parseDeprecatedService()} + {"EchoSettings", TestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "DeprecatedServiceSettings", + TestProtoLoader.instance().parseDeprecatedService(), + "localhost:7469" + } }); } @@ -41,6 +45,9 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; + @Parameterized.Parameter(2) + public String defaultHostExpected; + @Test public void generateServiceSettingsClasses() { Service service = context.services().get(0); @@ -52,5 +59,6 @@ public void generateServiceSettingsClasses() { "servicesettings", clazz.classDefinition().packageString(), clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java index bb0619d315..0da8ac4548 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java @@ -31,8 +31,8 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho()}, - {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService()} + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), ""}, + {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), ""} }); } @@ -41,6 +41,9 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; + @Parameterized.Parameter(2) + public String defaultHostExpected; + @Test public void generateServiceStubClasses() { Service service = context.services().get(0); @@ -48,5 +51,6 @@ public void generateServiceStubClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java index 9a63099d7d..019252dce3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java @@ -30,10 +30,24 @@ public class ServiceStubSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"LoggingServiceV2StubSettings", GrpcTestProtoLoader.instance().parseLogging()}, - {"PublisherStubSettings", GrpcTestProtoLoader.instance().parsePubSubPublisher()}, - {"EchoStubSettings", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, - {"DeprecatedServiceStubSettings", GrpcTestProtoLoader.instance().parseDeprecatedService()} + { + "LoggingServiceV2StubSettings", + GrpcTestProtoLoader.instance().parseLogging(), + "logging.googleapis.com:443" + }, + { + "PublisherStubSettings", + GrpcTestProtoLoader.instance().parsePubSubPublisher(), + "pubsub.googleapis.com:443" + }, + { + "EchoStubSettings", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469" + }, + { + "DeprecatedServiceStubSettings", + GrpcTestProtoLoader.instance().parseDeprecatedService(), + "localhost:7469" + } }); } @@ -42,6 +56,9 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; + @Parameterized.Parameter(2) + public String defaultHostExpected; + @Test public void generateServiceStubSettingsClasses() { Service service = context.services().get(0); @@ -53,5 +70,6 @@ public void generateServiceStubSettingsClasses() { "servicesettings/stub", clazz.classDefinition().packageString(), clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); } } diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java index 61b2792c71..f8a8404fb2 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzeiampolicy_async] +// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicy() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzeiampolicy_async] +// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java index bdb37c4140..8a1b602a87 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzeiampolicy_sync] +// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -45,4 +45,4 @@ public static void syncAnalyzeIamPolicy() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzeiampolicy_sync] +// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java index 089103aabe..a6ce1cb3b7 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] +// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AssetServiceClient; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] +// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java index c2848431bf..6ae9138184 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] +// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningMetadata; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; @@ -51,4 +51,4 @@ public static void asyncAnalyzeIamPolicyLongrunningLRO() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] +// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java index d180965d79..e2c6cc61bf 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] +// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -46,4 +46,4 @@ public static void syncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] +// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java index 0bccc2c63b..ac73e77a37 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzemove_async] +// [START cloudasset_v1_generated_assetserviceclient_analyzemove_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; @@ -47,4 +47,4 @@ public static void asyncAnalyzeMove() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzemove_async] +// [END cloudasset_v1_generated_assetserviceclient_analyzemove_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java index dd975540ee..b79e89dc7c 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_analyzemove_sync] +// [START cloudasset_v1_generated_assetserviceclient_analyzemove_sync] import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -43,4 +43,4 @@ public static void syncAnalyzeMove() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_analyzemove_sync] +// [END cloudasset_v1_generated_assetserviceclient_analyzemove_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java index 8748ef9d6d..63f45e8cca 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_batchgetassetshistory_async] +// [START cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; @@ -53,4 +53,4 @@ public static void asyncBatchGetAssetsHistory() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_batchgetassetshistory_async] +// [END cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java index cfb9e75eaa..b5f15f0651 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; import com.google.cloud.asset.v1.BatchGetAssetsHistoryResponse; @@ -49,4 +49,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java index 913a1c1c0d..4d4016e4c1 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] +// [START cloudasset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END asset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] +// [END cloudasset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java index fa2c2a4b4e..edf19aaab1 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_create_setendpoint_sync] +// [START cloudasset_v1_generated_assetserviceclient_create_setendpoint_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; import com.google.cloud.asset.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END asset_v1_generated_assetserviceclient_create_setendpoint_sync] +// [END cloudasset_v1_generated_assetserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java index 060c56a764..5c3beea239 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_createfeed_async] +// [START cloudasset_v1_generated_assetserviceclient_createfeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; @@ -47,4 +47,4 @@ public static void asyncCreateFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_createfeed_async] +// [END cloudasset_v1_generated_assetserviceclient_createfeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java index fea0a079f6..9e38918b80 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_createfeed_sync] +// [START cloudasset_v1_generated_assetserviceclient_createfeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; import com.google.cloud.asset.v1.Feed; @@ -44,4 +44,4 @@ public static void syncCreateFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_createfeed_sync] +// [END cloudasset_v1_generated_assetserviceclient_createfeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java index 66eddd4c27..dab302c7bf 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_createfeed_string_sync] +// [START cloudasset_v1_generated_assetserviceclient_createfeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncCreateFeedString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_createfeed_string_sync] +// [END cloudasset_v1_generated_assetserviceclient_createfeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java index cc5bdb96e8..8f08047829 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_deletefeed_async] +// [START cloudasset_v1_generated_assetserviceclient_deletefeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_deletefeed_async] +// [END cloudasset_v1_generated_assetserviceclient_deletefeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java index 1786f511b9..b7f134f14a 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_deletefeed_sync] +// [START cloudasset_v1_generated_assetserviceclient_deletefeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncDeleteFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_deletefeed_sync] +// [END cloudasset_v1_generated_assetserviceclient_deletefeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java index b16984b667..1722e7491b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_deletefeed_feedname_sync] +// [START cloudasset_v1_generated_assetserviceclient_deletefeed_feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedFeedname() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_deletefeed_feedname_sync] +// [END cloudasset_v1_generated_assetserviceclient_deletefeed_feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java index 0ec0024d65..08ed770e30 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_deletefeed_string_sync] +// [START cloudasset_v1_generated_assetserviceclient_deletefeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_deletefeed_string_sync] +// [END cloudasset_v1_generated_assetserviceclient_deletefeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java index 052bfdc1c8..6781343b09 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_exportassets_async] +// [START cloudasset_v1_generated_assetserviceclient_exportassets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -54,4 +54,4 @@ public static void asyncExportAssets() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_exportassets_async] +// [END cloudasset_v1_generated_assetserviceclient_exportassets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java index c136521b17..c097beb7dc 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_exportassets_lro_async] +// [START cloudasset_v1_generated_assetserviceclient_exportassets_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -55,4 +55,4 @@ public static void asyncExportAssetsLRO() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_exportassets_lro_async] +// [END cloudasset_v1_generated_assetserviceclient_exportassets_lro_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java index 599bfc76de..ba8621fec4 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_exportassets_sync] +// [START cloudasset_v1_generated_assetserviceclient_exportassets_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; import com.google.cloud.asset.v1.ExportAssetsRequest; @@ -51,4 +51,4 @@ public static void syncExportAssets() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_exportassets_sync] +// [END cloudasset_v1_generated_assetserviceclient_exportassets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java index 40de97de9e..4793d5051f 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_getfeed_async] +// [START cloudasset_v1_generated_assetserviceclient_getfeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -46,4 +46,4 @@ public static void asyncGetFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_getfeed_async] +// [END cloudasset_v1_generated_assetserviceclient_getfeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java index 0490c1c1ea..49f0b8e475 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_getfeed_sync] +// [START cloudasset_v1_generated_assetserviceclient_getfeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncGetFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_getfeed_sync] +// [END cloudasset_v1_generated_assetserviceclient_getfeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java index f697ff3f5b..6e7d947a77 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_getfeed_feedname_sync] +// [START cloudasset_v1_generated_assetserviceclient_getfeed_feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedFeedname() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_getfeed_feedname_sync] +// [END cloudasset_v1_generated_assetserviceclient_getfeed_feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java index 9e750f6c08..c9940d9c27 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_getfeed_string_sync] +// [START cloudasset_v1_generated_assetserviceclient_getfeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_getfeed_string_sync] +// [END cloudasset_v1_generated_assetserviceclient_getfeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java index 785a9297d5..75ae0c197c 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listassets_async] +// [START cloudasset_v1_generated_assetserviceclient_listassets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -56,4 +56,4 @@ public static void asyncListAssets() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listassets_async] +// [END cloudasset_v1_generated_assetserviceclient_listassets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java index 4c1b35e2b0..903af880c0 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listassets_paged_async] +// [START cloudasset_v1_generated_assetserviceclient_listassets_paged_async] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -64,4 +64,4 @@ public static void asyncListAssetsPaged() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listassets_paged_async] +// [END cloudasset_v1_generated_assetserviceclient_listassets_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java index 0d05589a3b..0f257a0265 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listassets_sync] +// [START cloudasset_v1_generated_assetserviceclient_listassets_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -53,4 +53,4 @@ public static void syncListAssets() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listassets_sync] +// [END cloudasset_v1_generated_assetserviceclient_listassets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java index 7943dc999d..15a6333d9b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listassets_resourcename_sync] +// [START cloudasset_v1_generated_assetserviceclient_listassets_resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -61,4 +61,4 @@ public String toString() { } } } -// [END asset_v1_generated_assetserviceclient_listassets_resourcename_sync] +// [END cloudasset_v1_generated_assetserviceclient_listassets_resourcename_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java index ddc3aa7ea5..12b46b6427 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listassets_string_sync] +// [START cloudasset_v1_generated_assetserviceclient_listassets_string_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; @@ -41,4 +41,4 @@ public static void syncListAssetsString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listassets_string_sync] +// [END cloudasset_v1_generated_assetserviceclient_listassets_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java index 3e47fc647d..9d3a8270d9 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listfeeds_async] +// [START cloudasset_v1_generated_assetserviceclient_listfeeds_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; @@ -44,4 +44,4 @@ public static void asyncListFeeds() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listfeeds_async] +// [END cloudasset_v1_generated_assetserviceclient_listfeeds_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java index 8bff72705d..5fb1b06488 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listfeeds_sync] +// [START cloudasset_v1_generated_assetserviceclient_listfeeds_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -40,4 +40,4 @@ public static void syncListFeeds() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listfeeds_sync] +// [END cloudasset_v1_generated_assetserviceclient_listfeeds_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java index 3d6a842eeb..1d4549559e 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_listfeeds_string_sync] +// [START cloudasset_v1_generated_assetserviceclient_listfeeds_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -38,4 +38,4 @@ public static void syncListFeedsString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_listfeeds_string_sync] +// [END cloudasset_v1_generated_assetserviceclient_listfeeds_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java index 7e7a38c530..8cba242783 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchalliampolicies_async] +// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -54,4 +54,4 @@ public static void asyncSearchAllIamPolicies() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchalliampolicies_async] +// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java index 4de6b3f53a..ee77539347 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] +// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -62,4 +62,4 @@ public static void asyncSearchAllIamPoliciesPaged() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] +// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java index 50ee2ef294..0268fc4940 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchalliampolicies_sync] +// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -51,4 +51,4 @@ public static void syncSearchAllIamPolicies() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchalliampolicies_sync] +// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java index 2704f9be42..6a8ba3ea40 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] +// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -42,4 +42,4 @@ public static void syncSearchAllIamPoliciesStringString() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] +// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java index 5d8a22c234..cc09e4e8dd 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchallresources_async] +// [START cloudasset_v1_generated_assetserviceclient_searchallresources_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; @@ -56,4 +56,4 @@ public static void asyncSearchAllResources() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchallresources_async] +// [END cloudasset_v1_generated_assetserviceclient_searchallresources_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java index c025ac210b..01a66aa016 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchallresources_paged_async] +// [START cloudasset_v1_generated_assetserviceclient_searchallresources_paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -64,4 +64,4 @@ public static void asyncSearchAllResourcesPaged() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchallresources_paged_async] +// [END cloudasset_v1_generated_assetserviceclient_searchallresources_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java index 5aeb9954d7..32b67c09a6 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchallresources_sync] +// [START cloudasset_v1_generated_assetserviceclient_searchallresources_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -53,4 +53,4 @@ public static void syncSearchAllResources() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_searchallresources_sync] +// [END cloudasset_v1_generated_assetserviceclient_searchallresources_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java index 7e87019e5d..8c207e88fe 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] +// [START cloudasset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncSearchAllResourcesStringStringListstring() throws Excepti } } } -// [END asset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] +// [END cloudasset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java index 4239ca9a66..e5f5bad9f1 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_updatefeed_async] +// [START cloudasset_v1_generated_assetserviceclient_updatefeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -47,4 +47,4 @@ public static void asyncUpdateFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_updatefeed_async] +// [END cloudasset_v1_generated_assetserviceclient_updatefeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java index 691eb8a262..c49e7302d5 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_updatefeed_sync] +// [START cloudasset_v1_generated_assetserviceclient_updatefeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.UpdateFeedRequest; @@ -44,4 +44,4 @@ public static void syncUpdateFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_updatefeed_sync] +// [END cloudasset_v1_generated_assetserviceclient_updatefeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java index dd9bbaba40..930eaa2345 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetserviceclient_updatefeed_feed_sync] +// [START cloudasset_v1_generated_assetserviceclient_updatefeed_feed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncUpdateFeedFeed() throws Exception { } } } -// [END asset_v1_generated_assetserviceclient_updatefeed_feed_sync] +// [END cloudasset_v1_generated_assetserviceclient_updatefeed_feed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index d7822c14a4..3d5d3c829b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START asset_v1_generated_assetservicesettings_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_assetservicesettings_batchgetassetshistory_sync] import com.google.cloud.asset.v1.AssetServiceSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END asset_v1_generated_assetservicesettings_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_assetservicesettings_batchgetassetshistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 2458f13c31..825f2fc417 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.stub.samples; -// [START asset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] import com.google.cloud.asset.v1.stub.AssetServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceStubSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END asset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java index 6ccb0e85c0..db4fcb3cea 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END credentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java index f70e6e791d..c9044fbb8b 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import com.google.cloud.iam.credentials.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END credentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java index 93836ff228..82fec39f81 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; @@ -52,4 +52,4 @@ public static void asyncGenerateAccessToken() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java index 58dd152c7c..4cf48ad7f3 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -48,4 +48,4 @@ public static void syncGenerateAccessToken() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java index 0a292c07fc..e93168fe15 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -47,4 +47,4 @@ public static void syncGenerateAccessTokenServiceaccountnameListstringListstring } } } -// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java index 39c08418a6..bfcdbec493 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateAccessTokenStringListstringListstringDuration() t } } } -// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java index c944008968..f670fc541c 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_async] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; @@ -51,4 +51,4 @@ public static void asyncGenerateIdToken() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_async] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java index aef054705b..8828bf341c 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -47,4 +47,4 @@ public static void syncGenerateIdToken() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java index b40ed382f4..f4b403409a 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateIdTokenServiceaccountnameListstringStringBoolean( } } } -// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java index 1dc6a89465..5627745068 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -45,4 +45,4 @@ public static void syncGenerateIdTokenStringListstringStringBoolean() throws Exc } } } -// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java index eadd080889..338c3112e0 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signblob_async] +// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -51,4 +51,4 @@ public static void asyncSignBlob() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signblob_async] +// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java index 629c21bceb..da2fa84ba8 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signblob_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobRequest; @@ -47,4 +47,4 @@ public static void syncSignBlob() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signblob_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java index 7d6157ae55..12ad8f05d7 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobServiceaccountnameListstringBytestring() throws E } } } -// [END credentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java index 0dd909a0fa..8e1906d162 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobStringListstringBytestring() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java index 1d59d04e5f..e788c93cee 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signjwt_async] +// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -50,4 +50,4 @@ public static void asyncSignJwt() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signjwt_async] +// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java index 648d1d2717..82b687d781 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signjwt_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtRequest; @@ -46,4 +46,4 @@ public static void syncSignJwt() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signjwt_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java index 4d3775724d..b0bfa2c1be 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtServiceaccountnameListstringString() throws Except } } } -// [END credentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java index f4f44cb917..fdb2a5080e 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] +// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtStringListstringString() throws Exception { } } } -// [END credentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] +// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java index 0ec7154cc9..9de6e9526c 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START credentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END credentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java index a36e698604..9668a2229f 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.stub.samples; -// [START credentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsStubSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END credentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java index 4506eaea40..12bc233abe 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricDecrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java index a4cb98e355..a30ce59b2f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricDecrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java index 25770fcafc..17d42368d0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -45,4 +45,4 @@ public static void syncAsymmetricDecryptCryptokeyversionnameBytestring() throws } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java index 0803f0216b..83b946207e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncAsymmetricDecryptStringBytestring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java index 9a59555f7d..caa1473dde 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricSign() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java index ebeb161bf2..d16356d4b9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricSign() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java index 5c0d200a8b..37dca40018 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -44,4 +44,4 @@ public static void syncAsymmetricSignCryptokeyversionnameDigest() throws Excepti } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java index 40d611a590..693e9bfc5e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -45,4 +45,4 @@ public static void syncAsymmetricSignStringDigest() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java index 1de0e707ce..9e76f9250c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END kms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java index fd4fa817fb..a47ef9da7c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; import com.google.cloud.kms.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END kms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java index b9b9bb1382..509ec9c1aa 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java index 285434da3d..4626d271e1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_sync] import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java index 4d906ae061..d40e15a269 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyKeyringnameStringCryptokey() throws Except } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java index 38f84ebd43..3b1616c1e9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyStringStringCryptokey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java index 1637224885..0595997ae5 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java index e57c816cb8..8b4f543898 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java index a5685dbaaa..8ccdcf86b3 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionCryptokeynameCryptokeyversion() thr } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java index 1e9cb43287..338d57775e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionStringCryptokeyversion() throws Exc } } } -// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java index af34ae5fcd..b557f641f9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createimportjob_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncCreateImportJob() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createimportjob_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java index fb1480df9a..1a1066d560 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createimportjob_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_sync] import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncCreateImportJob() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createimportjob_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java index 1d388ab264..8fe9146ac7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobKeyringnameStringImportjob() throws Except } } } -// [END kms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java index 093b8799bd..9d8031894f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobStringStringImportjob() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java index bfa237e476..a0c7c2dd6e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createkeyring_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -50,4 +50,4 @@ public static void asyncCreateKeyRing() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createkeyring_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java index 6979aa3e5c..be6e331a4d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createkeyring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_sync] import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -46,4 +46,4 @@ public static void syncCreateKeyRing() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createkeyring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java index 74034647d6..907f57aa3d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingLocationnameStringKeyring() throws Exception } } } -// [END kms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java index 6f244ba46f..3ae2929909 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingStringStringKeyring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java index b8d04eb6f5..20e0506c55 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_decrypt_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; @@ -56,4 +56,4 @@ public static void asyncDecrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_decrypt_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java index 5bb90544fe..733948ab43 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_decrypt_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; import com.google.cloud.kms.v1.DecryptResponse; @@ -52,4 +52,4 @@ public static void syncDecrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_decrypt_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java index 2c9fe6d8c1..9d0f93de64 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptCryptokeynameBytestring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java index 26b5088c7d..0e9ebecd78 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptStringBytestring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java index 96b3f7c43b..6e35f41857 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncDestroyCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java index 7d14750ced..00484ded76 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncDestroyCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java index 7480f39b2a..4089e10ef0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncDestroyCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java index f7e3f573a7..b8d997f9d6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDestroyCryptoKeyVersionString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java index 670e3c2ecc..77aa9a7a32 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_encrypt_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; @@ -56,4 +56,4 @@ public static void asyncEncrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_encrypt_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java index 2ede7ab4b1..1d6f5928f5 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_encrypt_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; import com.google.cloud.kms.v1.EncryptResponse; @@ -52,4 +52,4 @@ public static void syncEncrypt() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_encrypt_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java index eb2dde9fd1..79d3932c9d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; @@ -43,4 +43,4 @@ public static void syncEncryptResourcenameBytestring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java index 9cd6b9c0bb..cec9cf2333 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncEncryptStringBytestring() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java index 11c9d9933f..f777d40c39 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -50,4 +50,4 @@ public static void asyncGetCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java index cfe6c408e4..2ec60f1295 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.GetCryptoKeyRequest; @@ -46,4 +46,4 @@ public static void syncGetCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java index 80f310af0a..d049f653a2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyCryptokeyname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java index 1ae0e8f179..88f08857ee 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java index 62243f3c20..97d8ab731c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncGetCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java index 882fb75932..4977fc91a1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncGetCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java index 4e28c15fda..2310db9ebb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncGetCryptoKeyVersionCryptokeyversionname() throws Exceptio } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java index febdb4a86d..08c7728683 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncGetCryptoKeyVersionString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java index 50981d7822..401096168c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getiampolicy_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getiampolicy_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java index c317351717..c27aff6602 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getiampolicy_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getiampolicy_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java index 15d8df664c..ef11db67a0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getimportjob_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncGetImportJob() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getimportjob_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java index c49b07bdab..47cb997d54 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getimportjob_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_sync] import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; @@ -46,4 +46,4 @@ public static void syncGetImportJob() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getimportjob_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java index 657528e659..04cd565d8f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobImportjobname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java index 0acbf4a953..134f1f7981 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java index 44393ca245..24cce5e9be 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getkeyring_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -48,4 +48,4 @@ public static void asyncGetKeyRing() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getkeyring_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java index 7fda97b056..03f7a908ec 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getkeyring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_sync] import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -44,4 +44,4 @@ public static void syncGetKeyRing() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getkeyring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java index 3c8487c8ec..5a91330c62 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingKeyringname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java index 22df9329c8..9e86f8e39f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java index e6a8eae9c9..b2b1b8a18f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getlocation_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getlocation_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; @@ -44,4 +44,4 @@ public static void asyncGetLocation() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getlocation_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getlocation_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java index 3899dffdee..c26d5c7d30 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getlocation_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getlocation_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; import com.google.cloud.location.Location; @@ -40,4 +40,4 @@ public static void syncGetLocation() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getlocation_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getlocation_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java index bb11933f3c..5f779b2f9b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getpublickey_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; @@ -55,4 +55,4 @@ public static void asyncGetPublicKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getpublickey_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java index ec2082835e..7a5412ce50 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getpublickey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncGetPublicKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getpublickey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java index d9fc43d942..b83c6ef0d3 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -42,4 +42,4 @@ public static void syncGetPublicKeyCryptokeyversionname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java index 5f1593019e..21ef9ac23c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -43,4 +43,4 @@ public static void syncGetPublicKeyString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java index 6ee3e456bb..e8af8616fc 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -51,4 +51,4 @@ public static void asyncImportCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java index 6125e803e9..b1e7a2e675 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.ImportCryptoKeyVersionRequest; @@ -47,4 +47,4 @@ public static void syncImportCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java index ecb63ab787..9d57500ce0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListCryptoKeys() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java index c4bd7828f1..78e51a0786 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListCryptoKeysPaged() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java index 241c2db795..425054f5a6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListCryptoKeys() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java index 9e91cfc04c..d717447b4f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysKeyringname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java index 6ab2e2adfc..e724974a82 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java index 52567c2573..08ca16b7ed 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -56,4 +56,4 @@ public static void asyncListCryptoKeyVersions() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java index 9546866879..874c92f919 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -64,4 +64,4 @@ public static void asyncListCryptoKeyVersionsPaged() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java index 88091292a8..f06def473d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -53,4 +53,4 @@ public static void syncListCryptoKeyVersions() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java index 3652175240..98f65347de 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsCryptokeyname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java index 8d054c4967..86d2d44eed 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java index 09385d58e1..d9cad3d111 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListImportJobs() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java index 32131a1c56..5860192ae2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListImportJobsPaged() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java index 73e3363831..8d332bb928 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListImportJobs() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java index fa8fe3d794..dda6bdac38 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsKeyringname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java index 36277c90f1..a0c62ce5be 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java index 56a9cd3b95..e368d4e74c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -54,4 +54,4 @@ public static void asyncListKeyRings() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java index 287623a523..0f1699844e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -62,4 +62,4 @@ public static void asyncListKeyRingsPaged() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java index e8ffd8dca4..8a47b96eb6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -50,4 +50,4 @@ public static void syncListKeyRings() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java index cec3765454..bf0004166d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsLocationname() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java index 5794db5339..a1bc04535e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java index 2f9a5676f1..2c93eac415 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listlocations_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; @@ -52,4 +52,4 @@ public static void asyncListLocations() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listlocations_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java index 28e03c81ed..855e186729 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listlocations_paged_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.ListLocationsResponse; @@ -60,4 +60,4 @@ public static void asyncListLocationsPaged() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listlocations_paged_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java index 83d882829f..1ea5a3db8a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_listlocations_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.Location; @@ -48,4 +48,4 @@ public static void syncListLocations() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_listlocations_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java index 3e44a4eee2..715493b98b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncRestoreCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java index 3b7b242f1d..a3de0c99b8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncRestoreCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java index 6edc7d69aa..4c9cde5031 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncRestoreCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java index 91bf17eccb..876353526f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncRestoreCryptoKeyVersionString() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java index b5a9a02d79..3597e58f5a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_testiampermissions_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_testiampermissions_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java index ee169643d7..e33b06bb8b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_testiampermissions_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -48,4 +48,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_testiampermissions_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java index 95168be1b8..832a0e648f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java index ef8e9cded2..86c9549eb2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKey() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java index b31a813a66..980affb15b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -41,4 +41,4 @@ public static void syncUpdateCryptoKeyCryptokeyFieldmask() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java index 94399c8252..011d28534f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java index 0f7b570e0a..9d10d6f50e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java index ef854d7729..09f41244ee 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionCryptokeynameString() throws } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java index aeebde50d0..a9b17f02d8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionStringString() throws Except } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java index acc9d43dec..07666ee3ed 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java index 97a198efb9..f91fa9f0bd 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKeyVersion() throws Exception { } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java index ed1aaf15bf..7730719384 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] +// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -42,4 +42,4 @@ public static void syncUpdateCryptoKeyVersionCryptokeyversionFieldmask() throws } } } -// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] +// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java index 1d3331dc8a..c2bfa0f01c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START kms_v1_generated_keymanagementservicesettings_getkeyring_sync] +// [START cloudkms_v1_generated_keymanagementservicesettings_getkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END kms_v1_generated_keymanagementservicesettings_getkeyring_sync] +// [END cloudkms_v1_generated_keymanagementservicesettings_getkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java index 7baee4a57e..a41ec9fa58 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.stub.samples; -// [START kms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] +// [START cloudkms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] import com.google.cloud.kms.v1.stub.KeyManagementServiceStubSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END kms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] +// [END cloudkms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java index a0e8d8b883..b6f6a12b95 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] +// [START example_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END library_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] +// [END example_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java index 014b409361..2e9674debb 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_create_setendpoint_sync] +// [START example_v1_generated_libraryserviceclient_create_setendpoint_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; import com.google.cloud.example.library.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END library_v1_generated_libraryserviceclient_create_setendpoint_sync] +// [END example_v1_generated_libraryserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java index 19a3b5a765..5dbe9ea3a8 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createbook_async] +// [START example_v1_generated_libraryserviceclient_createbook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncCreateBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createbook_async] +// [END example_v1_generated_libraryserviceclient_createbook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java index d75dfd0215..b593ac0f36 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createbook_sync] +// [START example_v1_generated_libraryserviceclient_createbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.CreateBookRequest; @@ -44,4 +44,4 @@ public static void syncCreateBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createbook_sync] +// [END example_v1_generated_libraryserviceclient_createbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java index bd3963e824..4155f046ee 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] +// [START example_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookShelfnameBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] +// [END example_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java index 1c115d62ae..6bc2eb732a 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createbook_stringbook_sync] +// [START example_v1_generated_libraryserviceclient_createbook_stringbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookStringBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createbook_stringbook_sync] +// [END example_v1_generated_libraryserviceclient_createbook_stringbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java index 1a0ed5ff87..1a3e4e0cb8 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createshelf_async] +// [START example_v1_generated_libraryserviceclient_createshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; @@ -43,4 +43,4 @@ public static void asyncCreateShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createshelf_async] +// [END example_v1_generated_libraryserviceclient_createshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java index 41edfce737..7cc61a07b8 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createshelf_sync] +// [START example_v1_generated_libraryserviceclient_createshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; import com.google.example.library.v1.Shelf; @@ -40,4 +40,4 @@ public static void syncCreateShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createshelf_sync] +// [END example_v1_generated_libraryserviceclient_createshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java index 554007f360..067c90e13d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_createshelf_shelf_sync] +// [START example_v1_generated_libraryserviceclient_createshelf_shelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; @@ -38,4 +38,4 @@ public static void syncCreateShelfShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_createshelf_shelf_sync] +// [END example_v1_generated_libraryserviceclient_createshelf_shelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java index 2626b080c3..3388ada78d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deletebook_async] +// [START example_v1_generated_libraryserviceclient_deletebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; @@ -46,4 +46,4 @@ public static void asyncDeleteBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deletebook_async] +// [END example_v1_generated_libraryserviceclient_deletebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java index 270c06e9cd..4ef50221de 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deletebook_sync] +// [START example_v1_generated_libraryserviceclient_deletebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.example.library.v1.DeleteBookRequest; @@ -43,4 +43,4 @@ public static void syncDeleteBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deletebook_sync] +// [END example_v1_generated_libraryserviceclient_deletebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java index 57bf605de1..0ebe865a59 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deletebook_bookname_sync] +// [START example_v1_generated_libraryserviceclient_deletebook_bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookBookname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deletebook_bookname_sync] +// [END example_v1_generated_libraryserviceclient_deletebook_bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java index 480c519b0c..369ae353d3 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deletebook_string_sync] +// [START example_v1_generated_libraryserviceclient_deletebook_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deletebook_string_sync] +// [END example_v1_generated_libraryserviceclient_deletebook_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java index f7379ff7ca..c1e9375ce3 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deleteshelf_async] +// [START example_v1_generated_libraryserviceclient_deleteshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; @@ -44,4 +44,4 @@ public static void asyncDeleteShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deleteshelf_async] +// [END example_v1_generated_libraryserviceclient_deleteshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java index 8c9506ba9d..2322037305 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deleteshelf_sync] +// [START example_v1_generated_libraryserviceclient_deleteshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncDeleteShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deleteshelf_sync] +// [END example_v1_generated_libraryserviceclient_deleteshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java index 68340f6c02..7de331b361 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] +// [START example_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] +// [END example_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java index 0dad6e4eb5..8a32bb7d78 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_deleteshelf_string_sync] +// [START example_v1_generated_libraryserviceclient_deleteshelf_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_deleteshelf_string_sync] +// [END example_v1_generated_libraryserviceclient_deleteshelf_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java index 1d3961fa67..b819462eb0 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getbook_async] +// [START example_v1_generated_libraryserviceclient_getbook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -44,4 +44,4 @@ public static void asyncGetBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getbook_async] +// [END example_v1_generated_libraryserviceclient_getbook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java index bf96bddbe8..6c4569ecdb 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getbook_sync] +// [START example_v1_generated_libraryserviceclient_getbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncGetBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getbook_sync] +// [END example_v1_generated_libraryserviceclient_getbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java index 513978ef3d..d7029a08a2 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getbook_bookname_sync] +// [START example_v1_generated_libraryserviceclient_getbook_bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookBookname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getbook_bookname_sync] +// [END example_v1_generated_libraryserviceclient_getbook_bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java index 29fab8d271..a36359a425 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getbook_string_sync] +// [START example_v1_generated_libraryserviceclient_getbook_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getbook_string_sync] +// [END example_v1_generated_libraryserviceclient_getbook_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java index 30daacbbb8..e759952106 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getshelf_async] +// [START example_v1_generated_libraryserviceclient_getshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; @@ -44,4 +44,4 @@ public static void asyncGetShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getshelf_async] +// [END example_v1_generated_libraryserviceclient_getshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java index 627164c577..719c5e6354 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getshelf_sync] +// [START example_v1_generated_libraryserviceclient_getshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; import com.google.example.library.v1.Shelf; @@ -41,4 +41,4 @@ public static void syncGetShelf() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getshelf_sync] +// [END example_v1_generated_libraryserviceclient_getshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java index 7bb09b105d..a819099ef3 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getshelf_shelfname_sync] +// [START example_v1_generated_libraryserviceclient_getshelf_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getshelf_shelfname_sync] +// [END example_v1_generated_libraryserviceclient_getshelf_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java index 2d176ba38d..e2a693d78d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_getshelf_string_sync] +// [START example_v1_generated_libraryserviceclient_getshelf_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_getshelf_string_sync] +// [END example_v1_generated_libraryserviceclient_getshelf_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java index 07aa0ce803..6b790d499c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listbooks_async] +// [START example_v1_generated_libraryserviceclient_listbooks_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -50,4 +50,4 @@ public static void asyncListBooks() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listbooks_async] +// [END example_v1_generated_libraryserviceclient_listbooks_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java index b359f09db4..dedb1f397f 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listbooks_paged_async] +// [START example_v1_generated_libraryserviceclient_listbooks_paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.Book; @@ -58,4 +58,4 @@ public static void asyncListBooksPaged() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listbooks_paged_async] +// [END example_v1_generated_libraryserviceclient_listbooks_paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java index 9a4c835c48..57d84742ef 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listbooks_sync] +// [START example_v1_generated_libraryserviceclient_listbooks_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ListBooksRequest; @@ -47,4 +47,4 @@ public static void syncListBooks() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listbooks_sync] +// [END example_v1_generated_libraryserviceclient_listbooks_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java index 5731838424..e952a2db7b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listbooks_shelfname_sync] +// [START example_v1_generated_libraryserviceclient_listbooks_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listbooks_shelfname_sync] +// [END example_v1_generated_libraryserviceclient_listbooks_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java index ac88e27f09..5a581add94 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listbooks_string_sync] +// [START example_v1_generated_libraryserviceclient_listbooks_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listbooks_string_sync] +// [END example_v1_generated_libraryserviceclient_listbooks_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java index 42df784232..0d45b07458 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listshelves_async] +// [START example_v1_generated_libraryserviceclient_listshelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; @@ -48,4 +48,4 @@ public static void asyncListShelves() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listshelves_async] +// [END example_v1_generated_libraryserviceclient_listshelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java index 4dae54af84..85dcf4049b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listshelves_paged_async] +// [START example_v1_generated_libraryserviceclient_listshelves_paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.ListShelvesRequest; @@ -56,4 +56,4 @@ public static void asyncListShelvesPaged() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listshelves_paged_async] +// [END example_v1_generated_libraryserviceclient_listshelves_paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java index f9f890cf89..e8d44e3511 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_listshelves_sync] +// [START example_v1_generated_libraryserviceclient_listshelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; import com.google.example.library.v1.Shelf; @@ -45,4 +45,4 @@ public static void syncListShelves() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_listshelves_sync] +// [END example_v1_generated_libraryserviceclient_listshelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java index 9583775c40..5dc9c53a6b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_async] +// [START example_v1_generated_libraryserviceclient_mergeshelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; @@ -47,4 +47,4 @@ public static void asyncMergeShelves() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_async] +// [END example_v1_generated_libraryserviceclient_mergeshelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java index 10b6a726f0..3a64bddc08 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_sync] +// [START example_v1_generated_libraryserviceclient_mergeshelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; import com.google.example.library.v1.Shelf; @@ -44,4 +44,4 @@ public static void syncMergeShelves() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_sync] +// [END example_v1_generated_libraryserviceclient_mergeshelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java index 27bfa0decb..af84c48d3b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] +// [START example_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] +// [END example_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java index 0d98e78383..e88240c32f 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] +// [START example_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] +// [END example_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java index d6592fb44c..31a440ea6f 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] +// [START example_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] +// [END example_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java index 36dd500532..8742a51ff6 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] +// [START example_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] +// [END example_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java index dac0502ba7..9f085bda34 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_async] +// [START example_v1_generated_libraryserviceclient_movebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -48,4 +48,4 @@ public static void asyncMoveBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_async] +// [END example_v1_generated_libraryserviceclient_movebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java index 48a42d5504..99259bf445 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_sync] +// [START example_v1_generated_libraryserviceclient_movebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -45,4 +45,4 @@ public static void syncMoveBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_sync] +// [END example_v1_generated_libraryserviceclient_movebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java index 48eba8e822..6381bac0cd 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] +// [START example_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] +// [END example_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java index 28ccd13155..479dc95ea1 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_booknamestring_sync] +// [START example_v1_generated_libraryserviceclient_movebook_booknamestring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_booknamestring_sync] +// [END example_v1_generated_libraryserviceclient_movebook_booknamestring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java index 28be6cf5af..e08d509fab 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] +// [START example_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringShelfname() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] +// [END example_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java index 90221d0f12..a3cca84350 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_movebook_stringstring_sync] +// [START example_v1_generated_libraryserviceclient_movebook_stringstring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringString() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_movebook_stringstring_sync] +// [END example_v1_generated_libraryserviceclient_movebook_stringstring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java index f25e8ecd8e..7f6be01fc1 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_updatebook_async] +// [START example_v1_generated_libraryserviceclient_updatebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncUpdateBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_updatebook_async] +// [END example_v1_generated_libraryserviceclient_updatebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java index f1e77b9bde..81e7750c21 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_updatebook_sync] +// [START example_v1_generated_libraryserviceclient_updatebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.UpdateBookRequest; @@ -44,4 +44,4 @@ public static void syncUpdateBook() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_updatebook_sync] +// [END example_v1_generated_libraryserviceclient_updatebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java index 802cde859a..78e82287d4 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] +// [START example_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.protobuf.FieldMask; @@ -40,4 +40,4 @@ public static void syncUpdateBookBookFieldmask() throws Exception { } } } -// [END library_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] +// [END example_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java index 4166702843..27b0379489 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START library_v1_generated_libraryservicesettings_createshelf_sync] +// [START example_v1_generated_libraryservicesettings_createshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END library_v1_generated_libraryservicesettings_createshelf_sync] +// [END example_v1_generated_libraryservicesettings_createshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java index 67041c148e..8f00ce9db7 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.stub.samples; -// [START library_v1_generated_libraryservicestubsettings_createshelf_sync] +// [START example_v1_generated_libraryservicestubsettings_createshelf_sync] import com.google.cloud.example.library.v1.stub.LibraryServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceStubSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END library_v1_generated_libraryservicestubsettings_createshelf_sync] +// [END example_v1_generated_libraryservicestubsettings_createshelf_sync] From c768691615c2abaec8dd9e98e4e2e76e47baac32 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Thu, 20 Oct 2022 02:55:47 +0000 Subject: [PATCH 055/103] deps: Upgrade protobuf to 3.21.7 (#1048) --- PROPERTIES.bzl | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PROPERTIES.bzl b/PROPERTIES.bzl index 78b7d809c0..4d5e0f286e 100644 --- a/PROPERTIES.bzl +++ b/PROPERTIES.bzl @@ -1,5 +1,5 @@ PROPERTIES = { - "version.com_google_protobuf": "3.19.1", + "version.com_google_protobuf": "3.21.7", # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8. "version.google_java_format": "1.7", "version.io_grpc_java": "1.42.1", @@ -10,7 +10,7 @@ PROPERTIES = { "maven.com_google_auto_value_auto_value": "com.google.auto.value:auto-value:1.7.2", "maven.com_google_auto_value_auto_value_annotations": "com.google.auto.value:auto-value-annotations:1.7.2", "maven.com_google_code_gson": "com.google.code.gson:gson:2.8.6", - "maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.19.1", + "maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.21.7", "maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.11", "maven.javax_annotation_javax_annotation_api": "javax.annotation:javax.annotation-api:1.3.2", diff --git a/pom.xml b/pom.xml index 705c9d8be5..66021f43a7 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:3.19.4:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier} From 3282e0fd9e43c597b5bc55de2af50f3b24ba8e0f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 03:12:14 +0000 Subject: [PATCH 056/103] chore(main): release 2.10.1 (#1036) :robot: I have created a release *beep* *boop* --- ## [2.10.1](https://togithub.com/googleapis/gapic-generator-java/compare/v2.10.0...v2.10.1) (2022-10-20) ### Bug Fixes * **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#1035](https://togithub.com/googleapis/gapic-generator-java/issues/1035)) ([f76634a](https://togithub.com/googleapis/gapic-generator-java/commit/f76634af8497ef2977376af570d175eb0fe91e6f)) * **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#1039](https://togithub.com/googleapis/gapic-generator-java/issues/1039)) ([9d25e47](https://togithub.com/googleapis/gapic-generator-java/commit/9d25e477126db35efd111a2b8ee76332b549ce91)) * **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#1050](https://togithub.com/googleapis/gapic-generator-java/issues/1050)) ([3b052e2](https://togithub.com/googleapis/gapic-generator-java/commit/3b052e27bb704124ae3214dd3e8708f8e32afe6c)) * **deps:** Update dependency org.yaml:snakeyaml to v1.32 ([#1037](https://togithub.com/googleapis/gapic-generator-java/issues/1037)) ([b520aa0](https://togithub.com/googleapis/gapic-generator-java/commit/b520aa0d35407daf96123d63c3112b9f29715115)) * **deps:** Update dependency org.yaml:snakeyaml to v1.33 ([#1043](https://togithub.com/googleapis/gapic-generator-java/issues/1043)) ([67a5dc5](https://togithub.com/googleapis/gapic-generator-java/commit/67a5dc5e4dd3302ececd212dd047f5731c4bf74d)) * Get numeric value for Enum fields if it is configured as query param or path param ([#1042](https://togithub.com/googleapis/gapic-generator-java/issues/1042)) ([0fdfa67](https://togithub.com/googleapis/gapic-generator-java/commit/0fdfa67fec84e1983c12b10c7b7ae7a0efa80f4d)) * Update sample region tag to parse host instead of proto package ([#1040](https://togithub.com/googleapis/gapic-generator-java/issues/1040)) ([01c14d4](https://togithub.com/googleapis/gapic-generator-java/commit/01c14d41d4195963c0ed46f310360f39eec6d420)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ version.txt | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8f0c42fd..4da28758a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [2.10.1](https://github.com/googleapis/gapic-generator-java/compare/v2.10.0...v2.10.1) (2022-10-20) + + +### Bug Fixes + +* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#1035](https://github.com/googleapis/gapic-generator-java/issues/1035)) ([f76634a](https://github.com/googleapis/gapic-generator-java/commit/f76634af8497ef2977376af570d175eb0fe91e6f)) +* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#1039](https://github.com/googleapis/gapic-generator-java/issues/1039)) ([9d25e47](https://github.com/googleapis/gapic-generator-java/commit/9d25e477126db35efd111a2b8ee76332b549ce91)) +* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#1050](https://github.com/googleapis/gapic-generator-java/issues/1050)) ([3b052e2](https://github.com/googleapis/gapic-generator-java/commit/3b052e27bb704124ae3214dd3e8708f8e32afe6c)) +* **deps:** Update dependency org.yaml:snakeyaml to v1.32 ([#1037](https://github.com/googleapis/gapic-generator-java/issues/1037)) ([b520aa0](https://github.com/googleapis/gapic-generator-java/commit/b520aa0d35407daf96123d63c3112b9f29715115)) +* **deps:** Update dependency org.yaml:snakeyaml to v1.33 ([#1043](https://github.com/googleapis/gapic-generator-java/issues/1043)) ([67a5dc5](https://github.com/googleapis/gapic-generator-java/commit/67a5dc5e4dd3302ececd212dd047f5731c4bf74d)) +* Get numeric value for Enum fields if it is configured as query param or path param ([#1042](https://github.com/googleapis/gapic-generator-java/issues/1042)) ([0fdfa67](https://github.com/googleapis/gapic-generator-java/commit/0fdfa67fec84e1983c12b10c7b7ae7a0efa80f4d)) +* Update sample region tag to parse host instead of proto package ([#1040](https://github.com/googleapis/gapic-generator-java/issues/1040)) ([01c14d4](https://github.com/googleapis/gapic-generator-java/commit/01c14d41d4195963c0ed46f310360f39eec6d420)) + ## [2.10.0](https://github.com/googleapis/gapic-generator-java/compare/v2.9.0...v2.10.0) (2022-09-06) diff --git a/version.txt b/version.txt index 10c2c0c3d6..8bbb6e406a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.10.0 +2.10.1 From 38010fd0ad251b69695c997bd6df692565739401 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:29:49 -0400 Subject: [PATCH 057/103] fix: update regionTag to use service name (#1047) * updating unit files and tests * update integration tests * refactor ClassNames --- ...iceClientCallableMethodSampleComposer.java | 20 +++++++----- .../ServiceClientHeaderSampleComposer.java | 7 +++-- .../ServiceClientMethodSampleComposer.java | 13 +++++--- .../gapic/composer/utils/ClassNames.java | 12 ++++++- .../api/generator/gapic/model/RegionTag.java | 5 +-- .../bookshopclient/AsyncGetBook.golden | 4 +-- .../SyncCreateSetCredentialsProvider.golden | 4 +-- .../SyncCreateSetEndpoint.golden | 4 +-- .../samples/bookshopclient/SyncGetBook.golden | 4 +-- .../SyncGetBookIntListbook.golden | 4 +-- .../SyncGetBookStringListbook.golden | 4 +-- .../AsyncFastFibonacci.golden | 4 +-- .../AsyncSlowFibonacci.golden | 4 +-- .../SyncCreateSetCredentialsProvider.golden | 4 +-- .../SyncCreateSetEndpoint.golden | 4 +-- .../SyncFastFibonacci.golden | 4 +-- .../SyncSlowFibonacci.golden | 4 +-- .../samples/echoclient/AsyncBlock.golden | 4 +-- .../samples/echoclient/AsyncChat.golden | 4 +-- .../samples/echoclient/AsyncChatAgain.golden | 4 +-- .../samples/echoclient/AsyncCollect.golden | 4 +-- .../echoclient/AsyncCollideName.golden | 4 +-- .../samples/echoclient/AsyncEcho.golden | 4 +-- .../samples/echoclient/AsyncExpand.golden | 4 +-- .../echoclient/AsyncPagedExpand.golden | 4 +-- .../echoclient/AsyncPagedExpandPaged.golden | 4 +-- .../echoclient/AsyncSimplePagedExpand.golden | 4 +-- .../AsyncSimplePagedExpandPaged.golden | 4 +-- .../samples/echoclient/AsyncWait.golden | 4 +-- .../samples/echoclient/AsyncWaitLRO.golden | 4 +-- .../samples/echoclient/SyncBlock.golden | 4 +-- .../samples/echoclient/SyncCollideName.golden | 4 +-- .../SyncCreateSetCredentialsProvider.golden | 4 +-- .../echoclient/SyncCreateSetEndpoint.golden | 4 +-- .../samples/echoclient/SyncEcho.golden | 4 +-- .../echoclient/SyncEchoFoobarname.golden | 4 +-- .../samples/echoclient/SyncEchoNoargs.golden | 4 +-- .../echoclient/SyncEchoResourcename.golden | 4 +-- .../samples/echoclient/SyncEchoStatus.golden | 4 +-- .../samples/echoclient/SyncEchoString.golden | 4 +-- .../samples/echoclient/SyncEchoString1.golden | 4 +-- .../samples/echoclient/SyncEchoString2.golden | 4 +-- .../echoclient/SyncEchoStringSeverity.golden | 4 +-- .../samples/echoclient/SyncPagedExpand.golden | 4 +-- .../echoclient/SyncSimplePagedExpand.golden | 4 +-- .../SyncSimplePagedExpandNoargs.golden | 4 +-- .../samples/echoclient/SyncWait.golden | 4 +-- .../echoclient/SyncWaitDuration.golden | 4 +-- .../echoclient/SyncWaitTimestamp.golden | 4 +-- .../identityclient/AsyncCreateUser.golden | 4 +-- .../identityclient/AsyncDeleteUser.golden | 4 +-- .../identityclient/AsyncGetUser.golden | 4 +-- .../identityclient/AsyncListUsers.golden | 4 +-- .../identityclient/AsyncListUsersPaged.golden | 4 +-- .../identityclient/AsyncUpdateUser.golden | 4 +-- .../SyncCreateSetCredentialsProvider.golden | 4 +-- .../SyncCreateSetEndpoint.golden | 4 +-- .../identityclient/SyncCreateUser.golden | 4 +-- .../SyncCreateUserStringStringString.golden | 4 +-- ...gStringStringIntStringBooleanDouble.golden | 4 +-- ...ngStringIntStringStringStringString.golden | 4 +-- .../identityclient/SyncDeleteUser.golden | 4 +-- .../SyncDeleteUserString.golden | 4 +-- .../SyncDeleteUserUsername.golden | 4 +-- .../samples/identityclient/SyncGetUser.golden | 4 +-- .../identityclient/SyncGetUserString.golden | 4 +-- .../identityclient/SyncGetUserUsername.golden | 4 +-- .../identityclient/SyncListUsers.golden | 4 +-- .../identityclient/SyncUpdateUser.golden | 4 +-- .../messagingclient/AsyncConnect.golden | 4 +-- .../messagingclient/AsyncCreateBlurb.golden | 4 +-- .../messagingclient/AsyncCreateRoom.golden | 4 +-- .../messagingclient/AsyncDeleteBlurb.golden | 4 +-- .../messagingclient/AsyncDeleteRoom.golden | 4 +-- .../messagingclient/AsyncGetBlurb.golden | 4 +-- .../messagingclient/AsyncGetRoom.golden | 4 +-- .../messagingclient/AsyncListBlurbs.golden | 4 +-- .../AsyncListBlurbsPaged.golden | 4 +-- .../messagingclient/AsyncListRooms.golden | 4 +-- .../AsyncListRoomsPaged.golden | 4 +-- .../messagingclient/AsyncSearchBlurbs.golden | 4 +-- .../AsyncSearchBlurbsLRO.golden | 4 +-- .../messagingclient/AsyncSendBlurbs.golden | 4 +-- .../messagingclient/AsyncStreamBlurbs.golden | 4 +-- .../messagingclient/AsyncUpdateBlurb.golden | 4 +-- .../messagingclient/AsyncUpdateRoom.golden | 4 +-- .../messagingclient/SyncCreateBlurb.golden | 4 +-- ...yncCreateBlurbProfilenameBytestring.golden | 4 +-- .../SyncCreateBlurbProfilenameString.golden | 4 +-- .../SyncCreateBlurbRoomnameBytestring.golden | 4 +-- .../SyncCreateBlurbRoomnameString.golden | 4 +-- .../SyncCreateBlurbStringBytestring.golden | 4 +-- .../SyncCreateBlurbStringString.golden | 4 +-- .../messagingclient/SyncCreateRoom.golden | 4 +-- .../SyncCreateRoomStringString.golden | 4 +-- .../SyncCreateSetCredentialsProvider.golden | 4 +-- .../SyncCreateSetEndpoint.golden | 4 +-- .../messagingclient/SyncDeleteBlurb.golden | 4 +-- .../SyncDeleteBlurbBlurbname.golden | 4 +-- .../SyncDeleteBlurbString.golden | 4 +-- .../messagingclient/SyncDeleteRoom.golden | 4 +-- .../SyncDeleteRoomRoomname.golden | 4 +-- .../SyncDeleteRoomString.golden | 4 +-- .../messagingclient/SyncGetBlurb.golden | 4 +-- .../SyncGetBlurbBlurbname.golden | 4 +-- .../messagingclient/SyncGetBlurbString.golden | 4 +-- .../messagingclient/SyncGetRoom.golden | 4 +-- .../SyncGetRoomRoomname.golden | 4 +-- .../messagingclient/SyncGetRoomString.golden | 4 +-- .../messagingclient/SyncListBlurbs.golden | 4 +-- .../SyncListBlurbsProfilename.golden | 4 +-- .../SyncListBlurbsRoomname.golden | 4 +-- .../SyncListBlurbsString.golden | 4 +-- .../messagingclient/SyncListRooms.golden | 4 +-- .../messagingclient/SyncSearchBlurbs.golden | 4 +-- .../SyncSearchBlurbsString.golden | 4 +-- .../messagingclient/SyncUpdateBlurb.golden | 4 +-- .../messagingclient/SyncUpdateRoom.golden | 4 +-- .../samples/servicesettings/SyncEcho.golden | 4 +-- .../servicesettings/SyncFastFibonacci.golden | 4 +-- .../stub/SyncCreateTopic.golden | 4 +-- .../servicesettings/stub/SyncDeleteLog.golden | 4 +-- .../servicesettings/stub/SyncEcho.golden | 4 +-- .../stub/SyncFastFibonacci.golden | 4 +-- .../samplecode/SampleCodeWriterTest.java | 4 +-- .../samplecode/SampleComposerTest.java | 16 +++++----- .../gapic/composer/utils/ClassNamesTest.java | 31 +++++++++++++++++++ .../generator/gapic/model/RegionTagTest.java | 8 ++--- .../AsyncAnalyzeIamPolicy.java | 4 +-- .../SyncAnalyzeIamPolicy.java | 4 +-- .../AsyncAnalyzeIamPolicyLongrunning.java | 4 +-- .../AsyncAnalyzeIamPolicyLongrunningLRO.java | 4 +-- .../SyncAnalyzeIamPolicyLongrunning.java | 4 +-- .../analyzemove/AsyncAnalyzeMove.java | 4 +-- .../analyzemove/SyncAnalyzeMove.java | 4 +-- .../AsyncBatchGetAssetsHistory.java | 4 +-- .../SyncBatchGetAssetsHistory.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createfeed/AsyncCreateFeed.java | 4 +-- .../createfeed/SyncCreateFeed.java | 4 +-- .../createfeed/SyncCreateFeedString.java | 4 +-- .../deletefeed/AsyncDeleteFeed.java | 4 +-- .../deletefeed/SyncDeleteFeed.java | 4 +-- .../deletefeed/SyncDeleteFeedFeedname.java | 4 +-- .../deletefeed/SyncDeleteFeedString.java | 4 +-- .../exportassets/AsyncExportAssets.java | 4 +-- .../exportassets/AsyncExportAssetsLRO.java | 4 +-- .../exportassets/SyncExportAssets.java | 4 +-- .../getfeed/AsyncGetFeed.java | 4 +-- .../getfeed/SyncGetFeed.java | 4 +-- .../getfeed/SyncGetFeedFeedname.java | 4 +-- .../getfeed/SyncGetFeedString.java | 4 +-- .../listassets/AsyncListAssets.java | 4 +-- .../listassets/AsyncListAssetsPaged.java | 4 +-- .../listassets/SyncListAssets.java | 4 +-- .../SyncListAssetsResourcename.java | 4 +-- .../listassets/SyncListAssetsString.java | 4 +-- .../listfeeds/AsyncListFeeds.java | 4 +-- .../listfeeds/SyncListFeeds.java | 4 +-- .../listfeeds/SyncListFeedsString.java | 4 +-- .../AsyncSearchAllIamPolicies.java | 4 +-- .../AsyncSearchAllIamPoliciesPaged.java | 4 +-- .../SyncSearchAllIamPolicies.java | 4 +-- .../SyncSearchAllIamPoliciesStringString.java | 4 +-- .../AsyncSearchAllResources.java | 4 +-- .../AsyncSearchAllResourcesPaged.java | 4 +-- .../SyncSearchAllResources.java | 4 +-- ...rchAllResourcesStringStringListstring.java | 4 +-- .../updatefeed/AsyncUpdateFeed.java | 4 +-- .../updatefeed/SyncUpdateFeed.java | 4 +-- .../updatefeed/SyncUpdateFeedFeed.java | 4 +-- .../SyncBatchGetAssetsHistory.java | 4 +-- .../SyncBatchGetAssetsHistory.java | 4 +-- .../AsyncCheckAndMutateRow.java | 4 +-- .../SyncCheckAndMutateRow.java | 4 +-- ...ringRowfilterListmutationListmutation.java | 4 +-- ...wfilterListmutationListmutationString.java | 4 +-- ...ringRowfilterListmutationListmutation.java | 4 +-- ...wfilterListmutationListmutationString.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../mutaterow/AsyncMutateRow.java | 4 +-- .../mutaterow/SyncMutateRow.java | 4 +-- ...MutateRowStringBytestringListmutation.java | 4 +-- ...RowStringBytestringListmutationString.java | 4 +-- ...ateRowTablenameBytestringListmutation.java | 4 +-- ...TablenameBytestringListmutationString.java | 4 +-- .../mutaterows/AsyncMutateRows.java | 4 +-- .../AsyncReadModifyWriteRow.java | 4 +-- .../SyncReadModifyWriteRow.java | 4 +-- ...ringBytestringListreadmodifywriterule.java | 4 +-- ...testringListreadmodifywriteruleString.java | 4 +-- ...nameBytestringListreadmodifywriterule.java | 4 +-- ...testringListreadmodifywriteruleString.java | 4 +-- .../readrows/AsyncReadRows.java | 4 +-- .../samplerowkeys/AsyncSampleRowKeys.java | 4 +-- .../mutaterow/SyncMutateRow.java | 4 +-- .../mutaterow/SyncMutateRow.java | 4 +-- .../aggregatedlist/AsyncAggregatedList.java | 4 +-- .../AsyncAggregatedListPaged.java | 4 +-- .../aggregatedlist/SyncAggregatedList.java | 4 +-- .../SyncAggregatedListString.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../delete/AsyncDelete.java | 4 +-- .../delete/AsyncDeleteLRO.java | 4 +-- .../delete/SyncDelete.java | 4 +-- .../delete/SyncDeleteStringStringString.java | 4 +-- .../insert/AsyncInsert.java | 4 +-- .../insert/AsyncInsertLRO.java | 4 +-- .../insert/SyncInsert.java | 4 +-- .../insert/SyncInsertStringStringAddress.java | 4 +-- .../list/AsyncList.java | 4 +-- .../list/AsyncListPaged.java | 4 +-- .../list/SyncList.java | 4 +-- .../list/SyncListStringStringString.java | 4 +-- .../aggregatedlist/SyncAggregatedList.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../get/AsyncGet.java | 4 +-- .../get/SyncGet.java | 4 +-- .../get/SyncGetStringStringString.java | 4 +-- .../wait/AsyncWait.java | 4 +-- .../wait/SyncWait.java | 4 +-- .../wait/SyncWaitStringStringString.java | 4 +-- .../regionoperationssettings/get/SyncGet.java | 4 +-- .../aggregatedlist/SyncAggregatedList.java | 4 +-- .../get/SyncGet.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../AsyncGenerateAccessToken.java | 4 +-- .../SyncGenerateAccessToken.java | 4 +-- ...countnameListstringListstringDuration.java | 4 +-- ...kenStringListstringListstringDuration.java | 4 +-- .../generateidtoken/AsyncGenerateIdToken.java | 4 +-- .../generateidtoken/SyncGenerateIdToken.java | 4 +-- ...iceaccountnameListstringStringBoolean.java | 4 +-- ...eIdTokenStringListstringStringBoolean.java | 4 +-- .../signblob/AsyncSignBlob.java | 4 +-- .../signblob/SyncSignBlob.java | 4 +-- ...erviceaccountnameListstringBytestring.java | 4 +-- ...yncSignBlobStringListstringBytestring.java | 4 +-- .../signjwt/AsyncSignJwt.java | 4 +-- .../signjwt/SyncSignJwt.java | 4 +-- ...JwtServiceaccountnameListstringString.java | 4 +-- .../SyncSignJwtStringListstringString.java | 4 +-- .../SyncGenerateAccessToken.java | 4 +-- .../SyncGenerateAccessToken.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../setiampolicy/AsyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../AsyncAsymmetricDecrypt.java | 4 +-- .../SyncAsymmetricDecrypt.java | 4 +-- ...DecryptCryptokeyversionnameBytestring.java | 4 +-- ...SyncAsymmetricDecryptStringBytestring.java | 4 +-- .../asymmetricsign/AsyncAsymmetricSign.java | 4 +-- .../asymmetricsign/SyncAsymmetricSign.java | 4 +-- ...mmetricSignCryptokeyversionnameDigest.java | 4 +-- .../SyncAsymmetricSignStringDigest.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createcryptokey/AsyncCreateCryptoKey.java | 4 +-- .../createcryptokey/SyncCreateCryptoKey.java | 4 +-- ...teCryptoKeyKeyringnameStringCryptokey.java | 4 +-- ...cCreateCryptoKeyStringStringCryptokey.java | 4 +-- .../AsyncCreateCryptoKeyVersion.java | 4 +-- .../SyncCreateCryptoKeyVersion.java | 4 +-- ...yVersionCryptokeynameCryptokeyversion.java | 4 +-- ...ryptoKeyVersionStringCryptokeyversion.java | 4 +-- .../createimportjob/AsyncCreateImportJob.java | 4 +-- .../createimportjob/SyncCreateImportJob.java | 4 +-- ...teImportJobKeyringnameStringImportjob.java | 4 +-- ...cCreateImportJobStringStringImportjob.java | 4 +-- .../createkeyring/AsyncCreateKeyRing.java | 4 +-- .../createkeyring/SyncCreateKeyRing.java | 4 +-- ...reateKeyRingLocationnameStringKeyring.java | 4 +-- .../SyncCreateKeyRingStringStringKeyring.java | 4 +-- .../decrypt/AsyncDecrypt.java | 4 +-- .../decrypt/SyncDecrypt.java | 4 +-- .../SyncDecryptCryptokeynameBytestring.java | 4 +-- .../decrypt/SyncDecryptStringBytestring.java | 4 +-- .../AsyncDestroyCryptoKeyVersion.java | 4 +-- .../SyncDestroyCryptoKeyVersion.java | 4 +-- ...yCryptoKeyVersionCryptokeyversionname.java | 4 +-- .../SyncDestroyCryptoKeyVersionString.java | 4 +-- .../encrypt/AsyncEncrypt.java | 4 +-- .../encrypt/SyncEncrypt.java | 4 +-- .../SyncEncryptResourcenameBytestring.java | 4 +-- .../encrypt/SyncEncryptStringBytestring.java | 4 +-- .../getcryptokey/AsyncGetCryptoKey.java | 4 +-- .../getcryptokey/SyncGetCryptoKey.java | 4 +-- .../SyncGetCryptoKeyCryptokeyname.java | 4 +-- .../getcryptokey/SyncGetCryptoKeyString.java | 4 +-- .../AsyncGetCryptoKeyVersion.java | 4 +-- .../SyncGetCryptoKeyVersion.java | 4 +-- ...tCryptoKeyVersionCryptokeyversionname.java | 4 +-- .../SyncGetCryptoKeyVersionString.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../getimportjob/AsyncGetImportJob.java | 4 +-- .../getimportjob/SyncGetImportJob.java | 4 +-- .../SyncGetImportJobImportjobname.java | 4 +-- .../getimportjob/SyncGetImportJobString.java | 4 +-- .../getkeyring/AsyncGetKeyRing.java | 4 +-- .../getkeyring/SyncGetKeyRing.java | 4 +-- .../getkeyring/SyncGetKeyRingKeyringname.java | 4 +-- .../getkeyring/SyncGetKeyRingString.java | 4 +-- .../getlocation/AsyncGetLocation.java | 4 +-- .../getlocation/SyncGetLocation.java | 4 +-- .../getpublickey/AsyncGetPublicKey.java | 4 +-- .../getpublickey/SyncGetPublicKey.java | 4 +-- .../SyncGetPublicKeyCryptokeyversionname.java | 4 +-- .../getpublickey/SyncGetPublicKeyString.java | 4 +-- .../AsyncImportCryptoKeyVersion.java | 4 +-- .../SyncImportCryptoKeyVersion.java | 4 +-- .../listcryptokeys/AsyncListCryptoKeys.java | 4 +-- .../AsyncListCryptoKeysPaged.java | 4 +-- .../listcryptokeys/SyncListCryptoKeys.java | 4 +-- .../SyncListCryptoKeysKeyringname.java | 4 +-- .../SyncListCryptoKeysString.java | 4 +-- .../AsyncListCryptoKeyVersions.java | 4 +-- .../AsyncListCryptoKeyVersionsPaged.java | 4 +-- .../SyncListCryptoKeyVersions.java | 4 +-- ...yncListCryptoKeyVersionsCryptokeyname.java | 4 +-- .../SyncListCryptoKeyVersionsString.java | 4 +-- .../listimportjobs/AsyncListImportJobs.java | 4 +-- .../AsyncListImportJobsPaged.java | 4 +-- .../listimportjobs/SyncListImportJobs.java | 4 +-- .../SyncListImportJobsKeyringname.java | 4 +-- .../SyncListImportJobsString.java | 4 +-- .../listkeyrings/AsyncListKeyRings.java | 4 +-- .../listkeyrings/AsyncListKeyRingsPaged.java | 4 +-- .../listkeyrings/SyncListKeyRings.java | 4 +-- .../SyncListKeyRingsLocationname.java | 4 +-- .../listkeyrings/SyncListKeyRingsString.java | 4 +-- .../listlocations/AsyncListLocations.java | 4 +-- .../AsyncListLocationsPaged.java | 4 +-- .../listlocations/SyncListLocations.java | 4 +-- .../AsyncRestoreCryptoKeyVersion.java | 4 +-- .../SyncRestoreCryptoKeyVersion.java | 4 +-- ...eCryptoKeyVersionCryptokeyversionname.java | 4 +-- .../SyncRestoreCryptoKeyVersionString.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- .../updatecryptokey/AsyncUpdateCryptoKey.java | 4 +-- .../updatecryptokey/SyncUpdateCryptoKey.java | 4 +-- ...SyncUpdateCryptoKeyCryptokeyFieldmask.java | 4 +-- .../AsyncUpdateCryptoKeyPrimaryVersion.java | 4 +-- .../SyncUpdateCryptoKeyPrimaryVersion.java | 4 +-- ...oKeyPrimaryVersionCryptokeynameString.java | 4 +-- ...teCryptoKeyPrimaryVersionStringString.java | 4 +-- .../AsyncUpdateCryptoKeyVersion.java | 4 +-- .../SyncUpdateCryptoKeyVersion.java | 4 +-- ...toKeyVersionCryptokeyversionFieldmask.java | 4 +-- .../getkeyring/SyncGetKeyRing.java | 4 +-- .../getkeyring/SyncGetKeyRing.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createbook/AsyncCreateBook.java | 4 +-- .../createbook/SyncCreateBook.java | 4 +-- .../SyncCreateBookShelfnameBook.java | 4 +-- .../createbook/SyncCreateBookStringBook.java | 4 +-- .../createshelf/AsyncCreateShelf.java | 4 +-- .../createshelf/SyncCreateShelf.java | 4 +-- .../createshelf/SyncCreateShelfShelf.java | 4 +-- .../deletebook/AsyncDeleteBook.java | 4 +-- .../deletebook/SyncDeleteBook.java | 4 +-- .../deletebook/SyncDeleteBookBookname.java | 4 +-- .../deletebook/SyncDeleteBookString.java | 4 +-- .../deleteshelf/AsyncDeleteShelf.java | 4 +-- .../deleteshelf/SyncDeleteShelf.java | 4 +-- .../deleteshelf/SyncDeleteShelfShelfname.java | 4 +-- .../deleteshelf/SyncDeleteShelfString.java | 4 +-- .../getbook/AsyncGetBook.java | 4 +-- .../getbook/SyncGetBook.java | 4 +-- .../getbook/SyncGetBookBookname.java | 4 +-- .../getbook/SyncGetBookString.java | 4 +-- .../getshelf/AsyncGetShelf.java | 4 +-- .../getshelf/SyncGetShelf.java | 4 +-- .../getshelf/SyncGetShelfShelfname.java | 4 +-- .../getshelf/SyncGetShelfString.java | 4 +-- .../listbooks/AsyncListBooks.java | 4 +-- .../listbooks/AsyncListBooksPaged.java | 4 +-- .../listbooks/SyncListBooks.java | 4 +-- .../listbooks/SyncListBooksShelfname.java | 4 +-- .../listbooks/SyncListBooksString.java | 4 +-- .../listshelves/AsyncListShelves.java | 4 +-- .../listshelves/AsyncListShelvesPaged.java | 4 +-- .../listshelves/SyncListShelves.java | 4 +-- .../mergeshelves/AsyncMergeShelves.java | 4 +-- .../mergeshelves/SyncMergeShelves.java | 4 +-- .../SyncMergeShelvesShelfnameShelfname.java | 4 +-- .../SyncMergeShelvesShelfnameString.java | 4 +-- .../SyncMergeShelvesStringShelfname.java | 4 +-- .../SyncMergeShelvesStringString.java | 4 +-- .../movebook/AsyncMoveBook.java | 4 +-- .../movebook/SyncMoveBook.java | 4 +-- .../SyncMoveBookBooknameShelfname.java | 4 +-- .../movebook/SyncMoveBookBooknameString.java | 4 +-- .../movebook/SyncMoveBookStringShelfname.java | 4 +-- .../movebook/SyncMoveBookStringString.java | 4 +-- .../updatebook/AsyncUpdateBook.java | 4 +-- .../updatebook/SyncUpdateBook.java | 4 +-- .../SyncUpdateBookBookFieldmask.java | 4 +-- .../createshelf/SyncCreateShelf.java | 4 +-- .../createshelf/SyncCreateShelf.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createbucket/AsyncCreateBucket.java | 4 +-- .../createbucket/SyncCreateBucket.java | 4 +-- .../createexclusion/AsyncCreateExclusion.java | 4 +-- .../createexclusion/SyncCreateExclusion.java | 4 +-- ...clusionBillingaccountnameLogexclusion.java | 4 +-- ...CreateExclusionFoldernameLogexclusion.java | 4 +-- ...ExclusionOrganizationnameLogexclusion.java | 4 +-- ...reateExclusionProjectnameLogexclusion.java | 4 +-- ...SyncCreateExclusionStringLogexclusion.java | 4 +-- .../createsink/AsyncCreateSink.java | 4 +-- .../createsink/SyncCreateSink.java | 4 +-- ...ncCreateSinkBillingaccountnameLogsink.java | 4 +-- .../SyncCreateSinkFoldernameLogsink.java | 4 +-- ...SyncCreateSinkOrganizationnameLogsink.java | 4 +-- .../SyncCreateSinkProjectnameLogsink.java | 4 +-- .../SyncCreateSinkStringLogsink.java | 4 +-- .../createview/AsyncCreateView.java | 4 +-- .../createview/SyncCreateView.java | 4 +-- .../deletebucket/AsyncDeleteBucket.java | 4 +-- .../deletebucket/SyncDeleteBucket.java | 4 +-- .../deleteexclusion/AsyncDeleteExclusion.java | 4 +-- .../deleteexclusion/SyncDeleteExclusion.java | 4 +-- .../SyncDeleteExclusionLogexclusionname.java | 4 +-- .../SyncDeleteExclusionString.java | 4 +-- .../deletesink/AsyncDeleteSink.java | 4 +-- .../deletesink/SyncDeleteSink.java | 4 +-- .../deletesink/SyncDeleteSinkLogsinkname.java | 4 +-- .../deletesink/SyncDeleteSinkString.java | 4 +-- .../deleteview/AsyncDeleteView.java | 4 +-- .../deleteview/SyncDeleteView.java | 4 +-- .../getbucket/AsyncGetBucket.java | 4 +-- .../getbucket/SyncGetBucket.java | 4 +-- .../getcmeksettings/AsyncGetCmekSettings.java | 4 +-- .../getcmeksettings/SyncGetCmekSettings.java | 4 +-- .../getexclusion/AsyncGetExclusion.java | 4 +-- .../getexclusion/SyncGetExclusion.java | 4 +-- .../SyncGetExclusionLogexclusionname.java | 4 +-- .../getexclusion/SyncGetExclusionString.java | 4 +-- .../getsink/AsyncGetSink.java | 4 +-- .../getsink/SyncGetSink.java | 4 +-- .../getsink/SyncGetSinkLogsinkname.java | 4 +-- .../getsink/SyncGetSinkString.java | 4 +-- .../getview/AsyncGetView.java | 4 +-- .../getview/SyncGetView.java | 4 +-- .../listbuckets/AsyncListBuckets.java | 4 +-- .../listbuckets/AsyncListBucketsPaged.java | 4 +-- .../listbuckets/SyncListBuckets.java | 4 +-- ...ListBucketsBillingaccountlocationname.java | 4 +-- .../SyncListBucketsFolderlocationname.java | 4 +-- .../SyncListBucketsLocationname.java | 4 +-- ...ncListBucketsOrganizationlocationname.java | 4 +-- .../listbuckets/SyncListBucketsString.java | 4 +-- .../listexclusions/AsyncListExclusions.java | 4 +-- .../AsyncListExclusionsPaged.java | 4 +-- .../listexclusions/SyncListExclusions.java | 4 +-- .../SyncListExclusionsBillingaccountname.java | 4 +-- .../SyncListExclusionsFoldername.java | 4 +-- .../SyncListExclusionsOrganizationname.java | 4 +-- .../SyncListExclusionsProjectname.java | 4 +-- .../SyncListExclusionsString.java | 4 +-- .../listsinks/AsyncListSinks.java | 4 +-- .../listsinks/AsyncListSinksPaged.java | 4 +-- .../listsinks/SyncListSinks.java | 4 +-- .../SyncListSinksBillingaccountname.java | 4 +-- .../listsinks/SyncListSinksFoldername.java | 4 +-- .../SyncListSinksOrganizationname.java | 4 +-- .../listsinks/SyncListSinksProjectname.java | 4 +-- .../listsinks/SyncListSinksString.java | 4 +-- .../listviews/AsyncListViews.java | 4 +-- .../listviews/AsyncListViewsPaged.java | 4 +-- .../listviews/SyncListViews.java | 4 +-- .../listviews/SyncListViewsString.java | 4 +-- .../undeletebucket/AsyncUndeleteBucket.java | 4 +-- .../undeletebucket/SyncUndeleteBucket.java | 4 +-- .../updatebucket/AsyncUpdateBucket.java | 4 +-- .../updatebucket/SyncUpdateBucket.java | 4 +-- .../AsyncUpdateCmekSettings.java | 4 +-- .../SyncUpdateCmekSettings.java | 4 +-- .../updateexclusion/AsyncUpdateExclusion.java | 4 +-- .../updateexclusion/SyncUpdateExclusion.java | 4 +-- ...LogexclusionnameLogexclusionFieldmask.java | 4 +-- ...eExclusionStringLogexclusionFieldmask.java | 4 +-- .../updatesink/AsyncUpdateSink.java | 4 +-- .../updatesink/SyncUpdateSink.java | 4 +-- .../SyncUpdateSinkLogsinknameLogsink.java | 4 +-- ...UpdateSinkLogsinknameLogsinkFieldmask.java | 4 +-- .../SyncUpdateSinkStringLogsink.java | 4 +-- .../SyncUpdateSinkStringLogsinkFieldmask.java | 4 +-- .../updateview/AsyncUpdateView.java | 4 +-- .../updateview/SyncUpdateView.java | 4 +-- .../getbucket/SyncGetBucket.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../deletelog/AsyncDeleteLog.java | 4 +-- .../deletelog/SyncDeleteLog.java | 4 +-- .../deletelog/SyncDeleteLogLogname.java | 4 +-- .../deletelog/SyncDeleteLogString.java | 4 +-- .../listlogentries/AsyncListLogEntries.java | 4 +-- .../AsyncListLogEntriesPaged.java | 4 +-- .../listlogentries/SyncListLogEntries.java | 4 +-- ...cListLogEntriesListstringStringString.java | 4 +-- .../listlogs/AsyncListLogs.java | 4 +-- .../listlogs/AsyncListLogsPaged.java | 4 +-- .../listlogs/SyncListLogs.java | 4 +-- .../SyncListLogsBillingaccountname.java | 4 +-- .../listlogs/SyncListLogsFoldername.java | 4 +-- .../SyncListLogsOrganizationname.java | 4 +-- .../listlogs/SyncListLogsProjectname.java | 4 +-- .../listlogs/SyncListLogsString.java | 4 +-- ...AsyncListMonitoredResourceDescriptors.java | 4 +-- ...ListMonitoredResourceDescriptorsPaged.java | 4 +-- .../SyncListMonitoredResourceDescriptors.java | 4 +-- .../taillogentries/AsyncTailLogEntries.java | 4 +-- .../writelogentries/AsyncWriteLogEntries.java | 4 +-- .../writelogentries/SyncWriteLogEntries.java | 4 +-- ...edresourceMapstringstringListlogentry.java | 4 +-- ...edresourceMapstringstringListlogentry.java | 4 +-- .../deletelog/SyncDeleteLog.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createlogmetric/AsyncCreateLogMetric.java | 4 +-- .../createlogmetric/SyncCreateLogMetric.java | 4 +-- ...ncCreateLogMetricProjectnameLogmetric.java | 4 +-- .../SyncCreateLogMetricStringLogmetric.java | 4 +-- .../deletelogmetric/AsyncDeleteLogMetric.java | 4 +-- .../deletelogmetric/SyncDeleteLogMetric.java | 4 +-- .../SyncDeleteLogMetricLogmetricname.java | 4 +-- .../SyncDeleteLogMetricString.java | 4 +-- .../getlogmetric/AsyncGetLogMetric.java | 4 +-- .../getlogmetric/SyncGetLogMetric.java | 4 +-- .../SyncGetLogMetricLogmetricname.java | 4 +-- .../getlogmetric/SyncGetLogMetricString.java | 4 +-- .../listlogmetrics/AsyncListLogMetrics.java | 4 +-- .../AsyncListLogMetricsPaged.java | 4 +-- .../listlogmetrics/SyncListLogMetrics.java | 4 +-- .../SyncListLogMetricsProjectname.java | 4 +-- .../SyncListLogMetricsString.java | 4 +-- .../updatelogmetric/AsyncUpdateLogMetric.java | 4 +-- .../updatelogmetric/SyncUpdateLogMetric.java | 4 +-- ...UpdateLogMetricLogmetricnameLogmetric.java | 4 +-- .../SyncUpdateLogMetricStringLogmetric.java | 4 +-- .../getlogmetric/SyncGetLogMetric.java | 4 +-- .../getbucket/SyncGetBucket.java | 4 +-- .../deletelog/SyncDeleteLog.java | 4 +-- .../getlogmetric/SyncGetLogMetric.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createschema/AsyncCreateSchema.java | 4 +-- .../createschema/SyncCreateSchema.java | 4 +-- ...ncCreateSchemaProjectnameSchemaString.java | 4 +-- .../SyncCreateSchemaStringSchemaString.java | 4 +-- .../deleteschema/AsyncDeleteSchema.java | 4 +-- .../deleteschema/SyncDeleteSchema.java | 4 +-- .../SyncDeleteSchemaSchemaname.java | 4 +-- .../deleteschema/SyncDeleteSchemaString.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../getschema/AsyncGetSchema.java | 4 +-- .../getschema/SyncGetSchema.java | 4 +-- .../getschema/SyncGetSchemaSchemaname.java | 4 +-- .../getschema/SyncGetSchemaString.java | 4 +-- .../listschemas/AsyncListSchemas.java | 4 +-- .../listschemas/AsyncListSchemasPaged.java | 4 +-- .../listschemas/SyncListSchemas.java | 4 +-- .../SyncListSchemasProjectname.java | 4 +-- .../listschemas/SyncListSchemasString.java | 4 +-- .../setiampolicy/AsyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- .../validatemessage/AsyncValidateMessage.java | 4 +-- .../validatemessage/SyncValidateMessage.java | 4 +-- .../validateschema/AsyncValidateSchema.java | 4 +-- .../validateschema/SyncValidateSchema.java | 4 +-- .../SyncValidateSchemaProjectnameSchema.java | 4 +-- .../SyncValidateSchemaStringSchema.java | 4 +-- .../createschema/SyncCreateSchema.java | 4 +-- .../createtopic/SyncCreateTopic.java | 4 +-- .../createschema/SyncCreateSchema.java | 4 +-- .../SyncCreateSubscription.java | 4 +-- .../acknowledge/AsyncAcknowledge.java | 4 +-- .../acknowledge/SyncAcknowledge.java | 4 +-- .../SyncAcknowledgeStringListstring.java | 4 +-- ...AcknowledgeSubscriptionnameListstring.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createsnapshot/AsyncCreateSnapshot.java | 4 +-- .../createsnapshot/SyncCreateSnapshot.java | 4 +-- .../SyncCreateSnapshotSnapshotnameString.java | 4 +-- ...eSnapshotSnapshotnameSubscriptionname.java | 4 +-- .../SyncCreateSnapshotStringString.java | 4 +-- ...cCreateSnapshotStringSubscriptionname.java | 4 +-- .../AsyncCreateSubscription.java | 4 +-- .../SyncCreateSubscription.java | 4 +-- ...SubscriptionStringStringPushconfigInt.java | 4 +-- ...scriptionStringTopicnamePushconfigInt.java | 4 +-- ...onSubscriptionnameStringPushconfigInt.java | 4 +-- ...ubscriptionnameTopicnamePushconfigInt.java | 4 +-- .../deletesnapshot/AsyncDeleteSnapshot.java | 4 +-- .../deletesnapshot/SyncDeleteSnapshot.java | 4 +-- .../SyncDeleteSnapshotSnapshotname.java | 4 +-- .../SyncDeleteSnapshotString.java | 4 +-- .../AsyncDeleteSubscription.java | 4 +-- .../SyncDeleteSubscription.java | 4 +-- .../SyncDeleteSubscriptionString.java | 4 +-- ...yncDeleteSubscriptionSubscriptionname.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../getsnapshot/AsyncGetSnapshot.java | 4 +-- .../getsnapshot/SyncGetSnapshot.java | 4 +-- .../SyncGetSnapshotSnapshotname.java | 4 +-- .../getsnapshot/SyncGetSnapshotString.java | 4 +-- .../getsubscription/AsyncGetSubscription.java | 4 +-- .../getsubscription/SyncGetSubscription.java | 4 +-- .../SyncGetSubscriptionString.java | 4 +-- .../SyncGetSubscriptionSubscriptionname.java | 4 +-- .../listsnapshots/AsyncListSnapshots.java | 4 +-- .../AsyncListSnapshotsPaged.java | 4 +-- .../listsnapshots/SyncListSnapshots.java | 4 +-- .../SyncListSnapshotsProjectname.java | 4 +-- .../SyncListSnapshotsString.java | 4 +-- .../AsyncListSubscriptions.java | 4 +-- .../AsyncListSubscriptionsPaged.java | 4 +-- .../SyncListSubscriptions.java | 4 +-- .../SyncListSubscriptionsProjectname.java | 4 +-- .../SyncListSubscriptionsString.java | 4 +-- .../AsyncModifyAckDeadline.java | 4 +-- .../SyncModifyAckDeadline.java | 4 +-- ...cModifyAckDeadlineStringListstringInt.java | 4 +-- ...DeadlineSubscriptionnameListstringInt.java | 4 +-- .../AsyncModifyPushConfig.java | 4 +-- .../SyncModifyPushConfig.java | 4 +-- .../SyncModifyPushConfigStringPushconfig.java | 4 +-- ...yPushConfigSubscriptionnamePushconfig.java | 4 +-- .../pull/AsyncPull.java | 4 +-- .../pull/SyncPull.java | 4 +-- .../pull/SyncPullStringBooleanInt.java | 4 +-- .../pull/SyncPullStringInt.java | 4 +-- .../SyncPullSubscriptionnameBooleanInt.java | 4 +-- .../pull/SyncPullSubscriptionnameInt.java | 4 +-- .../seek/AsyncSeek.java | 4 +-- .../seek/SyncSeek.java | 4 +-- .../setiampolicy/AsyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../streamingpull/AsyncStreamingPull.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- .../updatesnapshot/AsyncUpdateSnapshot.java | 4 +-- .../updatesnapshot/SyncUpdateSnapshot.java | 4 +-- .../AsyncUpdateSubscription.java | 4 +-- .../SyncUpdateSubscription.java | 4 +-- .../SyncCreateSubscription.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createtopic/AsyncCreateTopic.java | 4 +-- .../createtopic/SyncCreateTopic.java | 4 +-- .../createtopic/SyncCreateTopicString.java | 4 +-- .../createtopic/SyncCreateTopicTopicname.java | 4 +-- .../deletetopic/AsyncDeleteTopic.java | 4 +-- .../deletetopic/SyncDeleteTopic.java | 4 +-- .../deletetopic/SyncDeleteTopicString.java | 4 +-- .../deletetopic/SyncDeleteTopicTopicname.java | 4 +-- .../AsyncDetachSubscription.java | 4 +-- .../SyncDetachSubscription.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../gettopic/AsyncGetTopic.java | 4 +-- .../gettopic/SyncGetTopic.java | 4 +-- .../gettopic/SyncGetTopicString.java | 4 +-- .../gettopic/SyncGetTopicTopicname.java | 4 +-- .../listtopics/AsyncListTopics.java | 4 +-- .../listtopics/AsyncListTopicsPaged.java | 4 +-- .../listtopics/SyncListTopics.java | 4 +-- .../listtopics/SyncListTopicsProjectname.java | 4 +-- .../listtopics/SyncListTopicsString.java | 4 +-- .../AsyncListTopicSnapshots.java | 4 +-- .../AsyncListTopicSnapshotsPaged.java | 4 +-- .../SyncListTopicSnapshots.java | 4 +-- .../SyncListTopicSnapshotsString.java | 4 +-- .../SyncListTopicSnapshotsTopicname.java | 4 +-- .../AsyncListTopicSubscriptions.java | 4 +-- .../AsyncListTopicSubscriptionsPaged.java | 4 +-- .../SyncListTopicSubscriptions.java | 4 +-- .../SyncListTopicSubscriptionsString.java | 4 +-- .../SyncListTopicSubscriptionsTopicname.java | 4 +-- .../publish/AsyncPublish.java | 4 +-- .../publish/SyncPublish.java | 4 +-- .../SyncPublishStringListpubsubmessage.java | 4 +-- ...SyncPublishTopicnameListpubsubmessage.java | 4 +-- .../setiampolicy/AsyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- .../updatetopic/AsyncUpdateTopic.java | 4 +-- .../updatetopic/SyncUpdateTopic.java | 4 +-- .../createtopic/SyncCreateTopic.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createinstance/AsyncCreateInstance.java | 4 +-- .../AsyncCreateInstanceLRO.java | 4 +-- .../createinstance/SyncCreateInstance.java | 4 +-- ...ateInstanceLocationnameStringInstance.java | 4 +-- ...yncCreateInstanceStringStringInstance.java | 4 +-- .../deleteinstance/AsyncDeleteInstance.java | 4 +-- .../AsyncDeleteInstanceLRO.java | 4 +-- .../deleteinstance/SyncDeleteInstance.java | 4 +-- .../SyncDeleteInstanceInstancename.java | 4 +-- .../SyncDeleteInstanceString.java | 4 +-- .../exportinstance/AsyncExportInstance.java | 4 +-- .../AsyncExportInstanceLRO.java | 4 +-- .../exportinstance/SyncExportInstance.java | 4 +-- .../SyncExportInstanceStringOutputconfig.java | 4 +-- .../AsyncFailoverInstance.java | 4 +-- .../AsyncFailoverInstanceLRO.java | 4 +-- .../SyncFailoverInstance.java | 4 +-- ...overinstancerequestdataprotectionmode.java | 4 +-- ...overinstancerequestdataprotectionmode.java | 4 +-- .../getinstance/AsyncGetInstance.java | 4 +-- .../getinstance/SyncGetInstance.java | 4 +-- .../SyncGetInstanceInstancename.java | 4 +-- .../getinstance/SyncGetInstanceString.java | 4 +-- .../AsyncGetInstanceAuthString.java | 4 +-- .../SyncGetInstanceAuthString.java | 4 +-- ...SyncGetInstanceAuthStringInstancename.java | 4 +-- .../SyncGetInstanceAuthStringString.java | 4 +-- .../importinstance/AsyncImportInstance.java | 4 +-- .../AsyncImportInstanceLRO.java | 4 +-- .../importinstance/SyncImportInstance.java | 4 +-- .../SyncImportInstanceStringInputconfig.java | 4 +-- .../listinstances/AsyncListInstances.java | 4 +-- .../AsyncListInstancesPaged.java | 4 +-- .../listinstances/SyncListInstances.java | 4 +-- .../SyncListInstancesLocationname.java | 4 +-- .../SyncListInstancesString.java | 4 +-- .../AsyncRescheduleMaintenance.java | 4 +-- .../AsyncRescheduleMaintenanceLRO.java | 4 +-- .../SyncRescheduleMaintenance.java | 4 +-- ...tenancerequestrescheduletypeTimestamp.java | 4 +-- ...tenancerequestrescheduletypeTimestamp.java | 4 +-- .../updateinstance/AsyncUpdateInstance.java | 4 +-- .../AsyncUpdateInstanceLRO.java | 4 +-- .../updateinstance/SyncUpdateInstance.java | 4 +-- .../SyncUpdateInstanceFieldmaskInstance.java | 4 +-- .../upgradeinstance/AsyncUpgradeInstance.java | 4 +-- .../AsyncUpgradeInstanceLRO.java | 4 +-- .../upgradeinstance/SyncUpgradeInstance.java | 4 +-- ...SyncUpgradeInstanceInstancenameString.java | 4 +-- .../SyncUpgradeInstanceStringString.java | 4 +-- .../getinstance/SyncGetInstance.java | 4 +-- .../getinstance/SyncGetInstance.java | 4 +-- .../composeobject/AsyncComposeObject.java | 4 +-- .../composeobject/SyncComposeObject.java | 4 +-- .../SyncCreateSetCredentialsProvider.java | 4 +-- .../create/SyncCreateSetEndpoint.java | 4 +-- .../createbucket/AsyncCreateBucket.java | 4 +-- .../createbucket/SyncCreateBucket.java | 4 +-- ...ncCreateBucketProjectnameBucketString.java | 4 +-- .../SyncCreateBucketStringBucketString.java | 4 +-- .../createhmackey/AsyncCreateHmacKey.java | 4 +-- .../createhmackey/SyncCreateHmacKey.java | 4 +-- .../SyncCreateHmacKeyProjectnameString.java | 4 +-- .../SyncCreateHmacKeyStringString.java | 4 +-- .../AsyncCreateNotification.java | 4 +-- .../SyncCreateNotification.java | 4 +-- ...teNotificationProjectnameNotification.java | 4 +-- ...cCreateNotificationStringNotification.java | 4 +-- .../deletebucket/AsyncDeleteBucket.java | 4 +-- .../deletebucket/SyncDeleteBucket.java | 4 +-- .../SyncDeleteBucketBucketname.java | 4 +-- .../deletebucket/SyncDeleteBucketString.java | 4 +-- .../deletehmackey/AsyncDeleteHmacKey.java | 4 +-- .../deletehmackey/SyncDeleteHmacKey.java | 4 +-- .../SyncDeleteHmacKeyStringProjectname.java | 4 +-- .../SyncDeleteHmacKeyStringString.java | 4 +-- .../AsyncDeleteNotification.java | 4 +-- .../SyncDeleteNotification.java | 4 +-- ...yncDeleteNotificationNotificationname.java | 4 +-- .../SyncDeleteNotificationString.java | 4 +-- .../deleteobject/AsyncDeleteObject.java | 4 +-- .../deleteobject/SyncDeleteObject.java | 4 +-- .../SyncDeleteObjectStringString.java | 4 +-- .../SyncDeleteObjectStringStringLong.java | 4 +-- .../getbucket/AsyncGetBucket.java | 4 +-- .../getbucket/SyncGetBucket.java | 4 +-- .../getbucket/SyncGetBucketBucketname.java | 4 +-- .../getbucket/SyncGetBucketString.java | 4 +-- .../gethmackey/AsyncGetHmacKey.java | 4 +-- .../gethmackey/SyncGetHmacKey.java | 4 +-- .../SyncGetHmacKeyStringProjectname.java | 4 +-- .../SyncGetHmacKeyStringString.java | 4 +-- .../getiampolicy/AsyncGetIamPolicy.java | 4 +-- .../getiampolicy/SyncGetIamPolicy.java | 4 +-- .../SyncGetIamPolicyResourcename.java | 4 +-- .../getiampolicy/SyncGetIamPolicyString.java | 4 +-- .../getnotification/AsyncGetNotification.java | 4 +-- .../getnotification/SyncGetNotification.java | 4 +-- .../SyncGetNotificationBucketname.java | 4 +-- .../SyncGetNotificationString.java | 4 +-- .../getobject/AsyncGetObject.java | 4 +-- .../getobject/SyncGetObject.java | 4 +-- .../getobject/SyncGetObjectStringString.java | 4 +-- .../SyncGetObjectStringStringLong.java | 4 +-- .../AsyncGetServiceAccount.java | 4 +-- .../SyncGetServiceAccount.java | 4 +-- .../SyncGetServiceAccountProjectname.java | 4 +-- .../SyncGetServiceAccountString.java | 4 +-- .../listbuckets/AsyncListBuckets.java | 4 +-- .../listbuckets/AsyncListBucketsPaged.java | 4 +-- .../listbuckets/SyncListBuckets.java | 4 +-- .../SyncListBucketsProjectname.java | 4 +-- .../listbuckets/SyncListBucketsString.java | 4 +-- .../listhmackeys/AsyncListHmacKeys.java | 4 +-- .../listhmackeys/AsyncListHmacKeysPaged.java | 4 +-- .../listhmackeys/SyncListHmacKeys.java | 4 +-- .../SyncListHmacKeysProjectname.java | 4 +-- .../listhmackeys/SyncListHmacKeysString.java | 4 +-- .../AsyncListNotifications.java | 4 +-- .../AsyncListNotificationsPaged.java | 4 +-- .../SyncListNotifications.java | 4 +-- .../SyncListNotificationsProjectname.java | 4 +-- .../SyncListNotificationsString.java | 4 +-- .../listobjects/AsyncListObjects.java | 4 +-- .../listobjects/AsyncListObjectsPaged.java | 4 +-- .../listobjects/SyncListObjects.java | 4 +-- .../SyncListObjectsProjectname.java | 4 +-- .../listobjects/SyncListObjectsString.java | 4 +-- .../AsyncLockBucketRetentionPolicy.java | 4 +-- .../SyncLockBucketRetentionPolicy.java | 4 +-- ...ncLockBucketRetentionPolicyBucketname.java | 4 +-- .../SyncLockBucketRetentionPolicyString.java | 4 +-- .../AsyncQueryWriteStatus.java | 4 +-- .../SyncQueryWriteStatus.java | 4 +-- .../SyncQueryWriteStatusString.java | 4 +-- .../readobject/AsyncReadObject.java | 4 +-- .../rewriteobject/AsyncRewriteObject.java | 4 +-- .../rewriteobject/SyncRewriteObject.java | 4 +-- .../setiampolicy/AsyncSetIamPolicy.java | 4 +-- .../setiampolicy/SyncSetIamPolicy.java | 4 +-- .../SyncSetIamPolicyResourcenamePolicy.java | 4 +-- .../SyncSetIamPolicyStringPolicy.java | 4 +-- .../AsyncStartResumableWrite.java | 4 +-- .../SyncStartResumableWrite.java | 4 +-- .../AsyncTestIamPermissions.java | 4 +-- .../SyncTestIamPermissions.java | 4 +-- ...tIamPermissionsResourcenameListstring.java | 4 +-- ...yncTestIamPermissionsStringListstring.java | 4 +-- .../updatebucket/AsyncUpdateBucket.java | 4 +-- .../updatebucket/SyncUpdateBucket.java | 4 +-- .../SyncUpdateBucketBucketFieldmask.java | 4 +-- .../updatehmackey/AsyncUpdateHmacKey.java | 4 +-- .../updatehmackey/SyncUpdateHmacKey.java | 4 +-- ...UpdateHmacKeyHmackeymetadataFieldmask.java | 4 +-- .../updateobject/AsyncUpdateObject.java | 4 +-- .../updateobject/SyncUpdateObject.java | 4 +-- .../SyncUpdateObjectObjectFieldmask.java | 4 +-- .../writeobject/AsyncWriteObject.java | 4 +-- .../deletebucket/SyncDeleteBucket.java | 4 +-- .../deletebucket/SyncDeleteBucket.java | 4 +-- 874 files changed, 1815 insertions(+), 1761 deletions(-) create mode 100644 src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzeiampolicy/AsyncAnalyzeIamPolicy.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzeiampolicy/SyncAnalyzeIamPolicy.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzemove/AsyncAnalyzeMove.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/analyzemove/SyncAnalyzeMove.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/batchgetassetshistory/AsyncBatchGetAssetsHistory.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/batchgetassetshistory/SyncBatchGetAssetsHistory.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/createfeed/AsyncCreateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/createfeed/SyncCreateFeed.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/createfeed/SyncCreateFeedString.java (90%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/deletefeed/AsyncDeleteFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/deletefeed/SyncDeleteFeed.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/deletefeed/SyncDeleteFeedFeedname.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/deletefeed/SyncDeleteFeedString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/exportassets/AsyncExportAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/exportassets/AsyncExportAssetsLRO.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/exportassets/SyncExportAssets.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/getfeed/AsyncGetFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/getfeed/SyncGetFeed.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/getfeed/SyncGetFeedFeedname.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/getfeed/SyncGetFeedString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listassets/AsyncListAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listassets/AsyncListAssetsPaged.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listassets/SyncListAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listassets/SyncListAssetsResourcename.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listassets/SyncListAssetsString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listfeeds/AsyncListFeeds.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listfeeds/SyncListFeeds.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/listfeeds/SyncListFeedsString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchalliampolicies/AsyncSearchAllIamPolicies.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchalliampolicies/SyncSearchAllIamPolicies.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java (90%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchallresources/AsyncSearchAllResources.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchallresources/AsyncSearchAllResourcesPaged.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchallresources/SyncSearchAllResources.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/searchallresources/SyncSearchAllResourcesStringStringListstring.java (90%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/updatefeed/AsyncUpdateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/updatefeed/SyncUpdateFeed.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetserviceclient => assetservice}/updatefeed/SyncUpdateFeedFeed.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/AsyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/SyncCheckAndMutateRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/AsyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/SyncMutateRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/SyncMutateRowStringBytestringListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/SyncMutateRowStringBytestringListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/SyncMutateRowTablenameBytestringListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/mutaterows/AsyncMutateRows.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/AsyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/SyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/readrows/AsyncReadRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledataclient => basebigtabledata}/samplerowkeys/AsyncSampleRowKeys.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/aggregatedlist/AsyncAggregatedList.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/aggregatedlist/AsyncAggregatedListPaged.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/aggregatedlist/SyncAggregatedList.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/aggregatedlist/SyncAggregatedListString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/delete/AsyncDelete.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/delete/AsyncDeleteLRO.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/delete/SyncDelete.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/delete/SyncDeleteStringStringString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/insert/AsyncInsert.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/insert/AsyncInsertLRO.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/insert/SyncInsert.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/insert/SyncInsertStringStringAddress.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/list/AsyncList.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/list/AsyncListPaged.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/list/SyncList.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addressesclient => addresses}/list/SyncListStringStringString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/create/SyncCreateSetCredentialsProvider.java (90%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/get/AsyncGet.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/get/SyncGet.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/get/SyncGetStringStringString.java (90%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/wait/AsyncWait.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/wait/SyncWait.java (92%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperationsclient => regionoperations}/wait/SyncWaitStringStringString.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/create/SyncCreateSetCredentialsProvider.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateaccesstoken/AsyncGenerateAccessToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateaccesstoken/SyncGenerateAccessToken.java (92%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateidtoken/AsyncGenerateIdToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateidtoken/SyncGenerateIdToken.java (92%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signblob/AsyncSignBlob.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signblob/SyncSignBlob.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signblob/SyncSignBlobStringListstringBytestring.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signjwt/AsyncSignJwt.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signjwt/SyncSignJwt.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signjwt/SyncSignJwtServiceaccountnameListstringString.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentialsclient => iamcredentials}/signjwt/SyncSignJwtStringListstringString.java (90%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicyclient => iampolicy}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricdecrypt/AsyncAsymmetricDecrypt.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricdecrypt/SyncAsymmetricDecrypt.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricsign/AsyncAsymmetricSign.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricsign/SyncAsymmetricSign.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/asymmetricsign/SyncAsymmetricSignStringDigest.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/create/SyncCreateSetCredentialsProvider.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokey/AsyncCreateCryptoKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokey/SyncCreateCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokeyversion/SyncCreateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createimportjob/AsyncCreateImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createimportjob/SyncCreateImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createimportjob/SyncCreateImportJobStringStringImportjob.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createkeyring/AsyncCreateKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createkeyring/SyncCreateKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/createkeyring/SyncCreateKeyRingStringStringKeyring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/decrypt/AsyncDecrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/decrypt/SyncDecrypt.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/decrypt/SyncDecryptCryptokeynameBytestring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/decrypt/SyncDecryptStringBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/encrypt/AsyncEncrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/encrypt/SyncEncrypt.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/encrypt/SyncEncryptResourcenameBytestring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/encrypt/SyncEncryptStringBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokey/AsyncGetCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokey/SyncGetCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokey/SyncGetCryptoKeyCryptokeyname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokey/SyncGetCryptoKeyString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokeyversion/AsyncGetCryptoKeyVersion.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokeyversion/SyncGetCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getcryptokeyversion/SyncGetCryptoKeyVersionString.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getiampolicy/SyncGetIamPolicy.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getimportjob/AsyncGetImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getimportjob/SyncGetImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getimportjob/SyncGetImportJobImportjobname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getimportjob/SyncGetImportJobString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getkeyring/AsyncGetKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getkeyring/SyncGetKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getkeyring/SyncGetKeyRingKeyringname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getkeyring/SyncGetKeyRingString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getlocation/AsyncGetLocation.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getlocation/SyncGetLocation.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getpublickey/AsyncGetPublicKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getpublickey/SyncGetPublicKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getpublickey/SyncGetPublicKeyCryptokeyversionname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/getpublickey/SyncGetPublicKeyString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/importcryptokeyversion/AsyncImportCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/importcryptokeyversion/SyncImportCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeys/AsyncListCryptoKeys.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeys/AsyncListCryptoKeysPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeys/SyncListCryptoKeys.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeys/SyncListCryptoKeysKeyringname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeys/SyncListCryptoKeysString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeyversions/AsyncListCryptoKeyVersions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeyversions/SyncListCryptoKeyVersions.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listcryptokeyversions/SyncListCryptoKeyVersionsString.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listimportjobs/AsyncListImportJobs.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listimportjobs/AsyncListImportJobsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listimportjobs/SyncListImportJobs.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listimportjobs/SyncListImportJobsKeyringname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listimportjobs/SyncListImportJobsString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listkeyrings/AsyncListKeyRings.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listkeyrings/AsyncListKeyRingsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listkeyrings/SyncListKeyRings.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listkeyrings/SyncListKeyRingsLocationname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listkeyrings/SyncListKeyRingsString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listlocations/AsyncListLocations.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listlocations/AsyncListLocationsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/listlocations/SyncListLocations.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/testiampermissions/AsyncTestIamPermissions.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokey/AsyncUpdateCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokey/SyncUpdateCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementserviceclient => keymanagementservice}/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java (89%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createbook/AsyncCreateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createbook/SyncCreateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createbook/SyncCreateBookShelfnameBook.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createbook/SyncCreateBookStringBook.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createshelf/AsyncCreateShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createshelf/SyncCreateShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/createshelf/SyncCreateShelfShelf.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deletebook/AsyncDeleteBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deletebook/SyncDeleteBook.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deletebook/SyncDeleteBookBookname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deletebook/SyncDeleteBookString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deleteshelf/AsyncDeleteShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deleteshelf/SyncDeleteShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deleteshelf/SyncDeleteShelfShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/deleteshelf/SyncDeleteShelfString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getbook/AsyncGetBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getbook/SyncGetBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getbook/SyncGetBookBookname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getbook/SyncGetBookString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getshelf/AsyncGetShelf.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getshelf/SyncGetShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getshelf/SyncGetShelfShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/getshelf/SyncGetShelfString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listbooks/AsyncListBooks.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listbooks/AsyncListBooksPaged.java (94%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listbooks/SyncListBooks.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listbooks/SyncListBooksShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listbooks/SyncListBooksString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listshelves/AsyncListShelves.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listshelves/AsyncListShelvesPaged.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/listshelves/SyncListShelves.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/AsyncMergeShelves.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/SyncMergeShelves.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/SyncMergeShelvesShelfnameShelfname.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/SyncMergeShelvesShelfnameString.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/SyncMergeShelvesStringShelfname.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/mergeshelves/SyncMergeShelvesStringString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/AsyncMoveBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/SyncMoveBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/SyncMoveBookBooknameShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/SyncMoveBookBooknameString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/SyncMoveBookStringShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/movebook/SyncMoveBookStringString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/updatebook/AsyncUpdateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/updatebook/SyncUpdateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryserviceclient => libraryservice}/updatebook/SyncUpdateBookBookFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createbucket/AsyncCreateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createbucket/SyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/AsyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createexclusion/SyncCreateExclusionStringLogexclusion.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/AsyncCreateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSinkBillingaccountnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSinkFoldernameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSinkOrganizationnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSinkProjectnameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createsink/SyncCreateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createview/AsyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/createview/SyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletebucket/AsyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteexclusion/AsyncDeleteExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteexclusion/SyncDeleteExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteexclusion/SyncDeleteExclusionLogexclusionname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteexclusion/SyncDeleteExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletesink/AsyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletesink/SyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletesink/SyncDeleteSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deletesink/SyncDeleteSinkString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteview/AsyncDeleteView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/deleteview/SyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getbucket/AsyncGetBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getbucket/SyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getcmeksettings/AsyncGetCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getcmeksettings/SyncGetCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getexclusion/AsyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getexclusion/SyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getexclusion/SyncGetExclusionLogexclusionname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getexclusion/SyncGetExclusionString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getsink/AsyncGetSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getsink/SyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getsink/SyncGetSinkLogsinkname.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getsink/SyncGetSinkString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getview/AsyncGetView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/getview/SyncGetView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/AsyncListBuckets.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBucketsBillingaccountlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBucketsFolderlocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBucketsLocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBucketsOrganizationlocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/AsyncListExclusions.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/AsyncListExclusionsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusionsBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusionsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusionsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusionsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listexclusions/SyncListExclusionsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/AsyncListSinks.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/AsyncListSinksPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinks.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinksBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinksFoldername.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinksOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinksProjectname.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listsinks/SyncListSinksString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listviews/AsyncListViews.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listviews/AsyncListViewsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listviews/SyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/listviews/SyncListViewsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/undeletebucket/AsyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/undeletebucket/SyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatebucket/SyncUpdateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatecmeksettings/AsyncUpdateCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatecmeksettings/SyncUpdateCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateexclusion/AsyncUpdateExclusion.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateexclusion/SyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/AsyncUpdateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/SyncUpdateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/SyncUpdateSinkLogsinknameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/SyncUpdateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateview/AsyncUpdateView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configclient => config}/updateview/SyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/deletelog/AsyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/deletelog/SyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/deletelog/SyncDeleteLogLogname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/deletelog/SyncDeleteLogString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogentries/AsyncListLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogentries/AsyncListLogEntriesPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogentries/SyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogentries/SyncListLogEntriesListstringStringString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/AsyncListLogs.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/AsyncListLogsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogs.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogsBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listlogs/SyncListLogsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/taillogentries/AsyncTailLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/writelogentries/AsyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/writelogentries/SyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingclient => logging}/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/createlogmetric/AsyncCreateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/createlogmetric/SyncCreateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/createlogmetric/SyncCreateLogMetricStringLogmetric.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/deletelogmetric/AsyncDeleteLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/deletelogmetric/SyncDeleteLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/deletelogmetric/SyncDeleteLogMetricLogmetricname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/deletelogmetric/SyncDeleteLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/getlogmetric/AsyncGetLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/getlogmetric/SyncGetLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/getlogmetric/SyncGetLogMetricLogmetricname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/getlogmetric/SyncGetLogMetricString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/listlogmetrics/AsyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/listlogmetrics/AsyncListLogMetricsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/listlogmetrics/SyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/listlogmetrics/SyncListLogMetricsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/listlogmetrics/SyncListLogMetricsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/updatelogmetric/AsyncUpdateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/updatelogmetric/SyncUpdateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsclient => metrics}/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/createschema/AsyncCreateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/createschema/SyncCreateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/createschema/SyncCreateSchemaProjectnameSchemaString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/createschema/SyncCreateSchemaStringSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/deleteschema/AsyncDeleteSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/deleteschema/SyncDeleteSchema.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/deleteschema/SyncDeleteSchemaSchemaname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/deleteschema/SyncDeleteSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getschema/AsyncGetSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getschema/SyncGetSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getschema/SyncGetSchemaSchemaname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/getschema/SyncGetSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/listschemas/AsyncListSchemas.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/listschemas/AsyncListSchemasPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/listschemas/SyncListSchemas.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/listschemas/SyncListSchemasProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/listschemas/SyncListSchemasString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validatemessage/AsyncValidateMessage.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validatemessage/SyncValidateMessage.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validateschema/AsyncValidateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validateschema/SyncValidateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validateschema/SyncValidateSchemaProjectnameSchema.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaserviceclient => schemaservice}/validateschema/SyncValidateSchemaStringSchema.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/acknowledge/AsyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/acknowledge/SyncAcknowledge.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/acknowledge/SyncAcknowledgeStringListstring.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/AsyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/SyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/SyncCreateSnapshotSnapshotnameString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/SyncCreateSnapshotStringString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/AsyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/SyncCreateSubscription.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesnapshot/AsyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesnapshot/SyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesnapshot/SyncDeleteSnapshotSnapshotname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesnapshot/SyncDeleteSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesubscription/AsyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesubscription/SyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesubscription/SyncDeleteSubscriptionString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getiampolicy/SyncGetIamPolicy.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsnapshot/AsyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsnapshot/SyncGetSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsnapshot/SyncGetSnapshotSnapshotname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsnapshot/SyncGetSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsubscription/AsyncGetSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsubscription/SyncGetSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsubscription/SyncGetSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/getsubscription/SyncGetSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsnapshots/AsyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsnapshots/AsyncListSnapshotsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsnapshots/SyncListSnapshots.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsnapshots/SyncListSnapshotsProjectname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsnapshots/SyncListSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsubscriptions/AsyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsubscriptions/AsyncListSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsubscriptions/SyncListSubscriptions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsubscriptions/SyncListSubscriptionsProjectname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/listsubscriptions/SyncListSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifyackdeadline/AsyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifyackdeadline/SyncModifyAckDeadline.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifypushconfig/AsyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifypushconfig/SyncModifyPushConfig.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifypushconfig/SyncModifyPushConfigStringPushconfig.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/AsyncPull.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/SyncPull.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/SyncPullStringBooleanInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/SyncPullStringInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/SyncPullSubscriptionnameBooleanInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/pull/SyncPullSubscriptionnameInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/seek/AsyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/seek/SyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/setiampolicy/SyncSetIamPolicy.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/streamingpull/AsyncStreamingPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/updatesnapshot/AsyncUpdateSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/updatesnapshot/SyncUpdateSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/updatesubscription/AsyncUpdateSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadminclient => subscriptionadmin}/updatesubscription/SyncUpdateSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/createtopic/AsyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/createtopic/SyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/createtopic/SyncCreateTopicString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/createtopic/SyncCreateTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/deletetopic/AsyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/deletetopic/SyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/deletetopic/SyncDeleteTopicString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/deletetopic/SyncDeleteTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/detachsubscription/AsyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/detachsubscription/SyncDetachSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/gettopic/AsyncGetTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/gettopic/SyncGetTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/gettopic/SyncGetTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/gettopic/SyncGetTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopics/AsyncListTopics.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopics/AsyncListTopicsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopics/SyncListTopics.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopics/SyncListTopicsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopics/SyncListTopicsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsnapshots/AsyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsnapshots/SyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsnapshots/SyncListTopicSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsubscriptions/AsyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsubscriptions/SyncListTopicSubscriptions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsubscriptions/SyncListTopicSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/publish/AsyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/publish/SyncPublish.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/publish/SyncPublishStringListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/publish/SyncPublishTopicnameListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/updatetopic/AsyncUpdateTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadminclient => topicadmin}/updatetopic/SyncUpdateTopic.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/createinstance/AsyncCreateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/createinstance/AsyncCreateInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/createinstance/SyncCreateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/createinstance/SyncCreateInstanceLocationnameStringInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/createinstance/SyncCreateInstanceStringStringInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/deleteinstance/AsyncDeleteInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/deleteinstance/AsyncDeleteInstanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/deleteinstance/SyncDeleteInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/deleteinstance/SyncDeleteInstanceInstancename.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/deleteinstance/SyncDeleteInstanceString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/exportinstance/AsyncExportInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/exportinstance/AsyncExportInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/exportinstance/SyncExportInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/exportinstance/SyncExportInstanceStringOutputconfig.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/failoverinstance/AsyncFailoverInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/failoverinstance/AsyncFailoverInstanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/failoverinstance/SyncFailoverInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java (88%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java (89%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstance/AsyncGetInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstance/SyncGetInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstance/SyncGetInstanceInstancename.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstance/SyncGetInstanceString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstanceauthstring/AsyncGetInstanceAuthString.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstanceauthstring/SyncGetInstanceAuthString.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/getinstanceauthstring/SyncGetInstanceAuthStringString.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/importinstance/AsyncImportInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/importinstance/AsyncImportInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/importinstance/SyncImportInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/importinstance/SyncImportInstanceStringInputconfig.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/listinstances/AsyncListInstances.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/listinstances/AsyncListInstancesPaged.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/listinstances/SyncListInstances.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/listinstances/SyncListInstancesLocationname.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/listinstances/SyncListInstancesString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/reschedulemaintenance/AsyncRescheduleMaintenance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/reschedulemaintenance/SyncRescheduleMaintenance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java (88%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java (89%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/updateinstance/AsyncUpdateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/updateinstance/AsyncUpdateInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/updateinstance/SyncUpdateInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/updateinstance/SyncUpdateInstanceFieldmaskInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/upgradeinstance/AsyncUpgradeInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/upgradeinstance/AsyncUpgradeInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/upgradeinstance/SyncUpgradeInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/upgradeinstance/SyncUpgradeInstanceInstancenameString.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredisclient => cloudredis}/upgradeinstance/SyncUpgradeInstanceStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/composeobject/AsyncComposeObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/composeobject/SyncComposeObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createbucket/AsyncCreateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createbucket/SyncCreateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createbucket/SyncCreateBucketProjectnameBucketString.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createbucket/SyncCreateBucketStringBucketString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createhmackey/AsyncCreateHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createhmackey/SyncCreateHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createhmackey/SyncCreateHmacKeyProjectnameString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createhmackey/SyncCreateHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createnotification/AsyncCreateNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createnotification/SyncCreateNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createnotification/SyncCreateNotificationProjectnameNotification.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/createnotification/SyncCreateNotificationStringNotification.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletebucket/AsyncDeleteBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletebucket/SyncDeleteBucketBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletebucket/SyncDeleteBucketString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletehmackey/AsyncDeleteHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletehmackey/SyncDeleteHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletehmackey/SyncDeleteHmacKeyStringProjectname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletehmackey/SyncDeleteHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletenotification/AsyncDeleteNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletenotification/SyncDeleteNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletenotification/SyncDeleteNotificationNotificationname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deletenotification/SyncDeleteNotificationString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deleteobject/AsyncDeleteObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deleteobject/SyncDeleteObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deleteobject/SyncDeleteObjectStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/deleteobject/SyncDeleteObjectStringStringLong.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getbucket/AsyncGetBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getbucket/SyncGetBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getbucket/SyncGetBucketBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getbucket/SyncGetBucketString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/gethmackey/AsyncGetHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/gethmackey/SyncGetHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/gethmackey/SyncGetHmacKeyStringProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/gethmackey/SyncGetHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getiampolicy/AsyncGetIamPolicy.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getiampolicy/SyncGetIamPolicyResourcename.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getiampolicy/SyncGetIamPolicyString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getnotification/AsyncGetNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getnotification/SyncGetNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getnotification/SyncGetNotificationBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getnotification/SyncGetNotificationString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getobject/AsyncGetObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getobject/SyncGetObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getobject/SyncGetObjectStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getobject/SyncGetObjectStringStringLong.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getserviceaccount/AsyncGetServiceAccount.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getserviceaccount/SyncGetServiceAccount.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getserviceaccount/SyncGetServiceAccountProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/getserviceaccount/SyncGetServiceAccountString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listbuckets/AsyncListBuckets.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listbuckets/SyncListBuckets.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listbuckets/SyncListBucketsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listhmackeys/AsyncListHmacKeys.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listhmackeys/AsyncListHmacKeysPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listhmackeys/SyncListHmacKeys.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listhmackeys/SyncListHmacKeysProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listhmackeys/SyncListHmacKeysString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listnotifications/AsyncListNotifications.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listnotifications/AsyncListNotificationsPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listnotifications/SyncListNotifications.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listnotifications/SyncListNotificationsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listnotifications/SyncListNotificationsString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listobjects/AsyncListObjects.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listobjects/AsyncListObjectsPaged.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listobjects/SyncListObjects.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listobjects/SyncListObjectsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/listobjects/SyncListObjectsString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/querywritestatus/AsyncQueryWriteStatus.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/querywritestatus/SyncQueryWriteStatus.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/querywritestatus/SyncQueryWriteStatusString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/readobject/AsyncReadObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/rewriteobject/AsyncRewriteObject.java (96%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/rewriteobject/SyncRewriteObject.java (96%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/setiampolicy/SyncSetIamPolicyStringPolicy.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/startresumablewrite/AsyncStartResumableWrite.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/startresumablewrite/SyncStartResumableWrite.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/testiampermissions/SyncTestIamPermissionsStringListstring.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatebucket/SyncUpdateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatebucket/SyncUpdateBucketBucketFieldmask.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatehmackey/AsyncUpdateHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatehmackey/SyncUpdateHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updateobject/AsyncUpdateObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updateobject/SyncUpdateObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/updateobject/SyncUpdateObjectObjectFieldmask.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storageclient => storage}/writeobject/AsyncWriteObject.java (95%) diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java index ae1ad2bbb7..07bdcd29a7 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java @@ -42,6 +42,7 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.ast.WhileStatement; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; +import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; @@ -124,7 +125,8 @@ private static Sample composeUnaryOrLroCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -278,7 +280,8 @@ private static Sample composePagedCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setOverloadDisambiguation("Paged") .setIsAsynchronous(true) @@ -394,7 +397,7 @@ public static Sample composeLroCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientType.reference().name()) + .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .setOverloadDisambiguation("LRO") @@ -531,7 +534,7 @@ public static Sample composePagedCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientType.reference().name()) + .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -717,7 +720,8 @@ private static Sample composeStreamServerSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -796,7 +800,8 @@ private static Sample composeStreamBidiSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -928,7 +933,8 @@ private static Sample composeStreamClientSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index 6c3389b865..2c00498e4f 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -27,6 +27,7 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; +import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.HttpBindings; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; @@ -206,7 +207,7 @@ public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode s ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(clientName) + .setServiceName(ClassNames.getPureServiceName(clientName)) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); @@ -273,7 +274,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett .build(); RegionTag regionTag = RegionTag.builder() - .setServiceName(clientName) + .setServiceName(ClassNames.getPureServiceName(clientName)) .setRpcName(rpcName) .setOverloadDisambiguation("setEndpoint") .build(); @@ -346,7 +347,7 @@ public static Sample composeTransportSample( ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(clientName) + .setServiceName(ClassNames.getPureServiceName(clientName)) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java index f93383c729..5a45173595 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java @@ -27,6 +27,7 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; +import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; @@ -57,7 +58,8 @@ public static Sample composeEmptyServiceSample(TypeNode clientType) { RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName("emtpy") .build(); @@ -169,7 +171,8 @@ static Sample composeSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -243,7 +246,8 @@ static Sample composePagedSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -293,7 +297,8 @@ static Sample composeLroSample( } RegionTag regionTag = RegionTag.builder() - .setServiceName(clientVarExpr.variable().identifier().name()) + .setServiceName( + ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) diff --git a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java index c0b717fc0a..9d3a93162b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java +++ b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java @@ -15,6 +15,8 @@ package com.google.api.generator.gapic.composer.utils; import com.google.api.generator.gapic.model.Service; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -24,7 +26,8 @@ public class ClassNames { // Using constants since many of these class names are used often. private static final String MOCK_SERVICE_CLASS_NAME_PATTERN = "Mock%s"; private static final String MOCK_SERVICE_IMPL_CLASS_NAME_PATTERN = "Mock%sImpl"; - private static final String SERVICE_CLIENT_CLASS_NAME_PATTERN = "%sClient"; + private static final String CLIENT_SUFFIX = "Client"; + private static final String SERVICE_CLIENT_CLASS_NAME_PATTERN = "%s" + CLIENT_SUFFIX; private static final String SERVICE_CLIENT_TEST_CLASS_NAME_PATTERN = "%sClientTest"; private static final String SERVICE_CLIENT_TRANSPORT_TEST_CLASS_NAME_PATTERN = "%sClient%sTest"; private static final String SERVICE_SETTINGS_CLASS_NAME_PATTERN = "%sSettings"; @@ -120,4 +123,11 @@ private static String monolithBackwardsCompatibleName(String rawServiceName) { ? rawServiceName.replace("IAM", "Iam") : rawServiceName; } + + // For region tags, the service name should not include `Client` in the name + public static String getPureServiceName(String serviceClassName) { + return String.format( + "%s", + Iterables.getFirst(Splitter.on(CLIENT_SUFFIX).split(serviceClassName), serviceClassName)); + } } diff --git a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java index 29bb98eeef..e4643de654 100644 --- a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java +++ b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java @@ -138,7 +138,8 @@ public String generate() { if (!apiVersion().isEmpty()) { rt = rt + apiVersion() + "_"; } - rt = rt + "generated_" + serviceName() + "_" + rpcName(); + rt = rt.toLowerCase() + "generated_" + serviceName() + "_" + rpcName(); + // TODO: @alicejli overloadDisambiguation will need to be updated to match other languages if (!overloadDisambiguation().isEmpty()) { rt = rt + "_" + overloadDisambiguation(); } @@ -148,7 +149,7 @@ public String generate() { rt = rt + "_sync"; } - return rt.toLowerCase(); + return rt; } public static CommentStatement generateTag( diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden index a11e0c5ad1..87236a1311 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_getbook_async] +// [START goldensample_generated_Bookshop_GetBook_async] import com.google.api.core.ApiFuture; import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; @@ -48,4 +48,4 @@ public class AsyncGetBook { } } } -// [END goldensample_generated_bookshopclient_getbook_async] +// [END goldensample_generated_Bookshop_GetBook_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden index c34c8e5ace..346f1125da 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_create_setcredentialsprovider_sync] +// [START goldensample_generated_Bookshop_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.BookshopSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { BookshopClient bookshopClient = BookshopClient.create(bookshopSettings); } } -// [END goldensample_generated_bookshopclient_create_setcredentialsprovider_sync] +// [END goldensample_generated_Bookshop_Create_SetCredentialsProvider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden index 5ab576b5ab..43cd64aa7c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_create_setendpoint_sync] +// [START goldensample_generated_Bookshop_Create_SetEndpoint_sync] import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.BookshopSettings; import com.google.bookshop.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { BookshopClient bookshopClient = BookshopClient.create(bookshopSettings); } } -// [END goldensample_generated_bookshopclient_create_setendpoint_sync] +// [END goldensample_generated_Bookshop_Create_SetEndpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden index 9bcbe39862..bd89a8fc05 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_getbook_sync] +// [START goldensample_generated_Bookshop_GetBook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.GetBookRequest; @@ -45,4 +45,4 @@ public class SyncGetBook { } } } -// [END goldensample_generated_bookshopclient_getbook_sync] +// [END goldensample_generated_Bookshop_GetBook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden index 698f2a1138..31c6a24d01 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_getbook_intlistbook_sync] +// [START goldensample_generated_Bookshop_GetBook_IntListbook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import java.util.ArrayList; @@ -41,4 +41,4 @@ public class SyncGetBookIntListbook { } } } -// [END goldensample_generated_bookshopclient_getbook_intlistbook_sync] +// [END goldensample_generated_Bookshop_GetBook_IntListbook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden index c893608c2e..f2d3903e1b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_bookshopclient_getbook_stringlistbook_sync] +// [START goldensample_generated_Bookshop_GetBook_StringListbook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import java.util.ArrayList; @@ -41,4 +41,4 @@ public class SyncGetBookStringListbook { } } } -// [END goldensample_generated_bookshopclient_getbook_stringlistbook_sync] +// [END goldensample_generated_Bookshop_GetBook_StringListbook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden index c47156c7d9..ea0ae6c62d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_fastfibonacci_async] +// [START goldensample_generated_DeprecatedService_FastFibonacci_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; @@ -42,4 +42,4 @@ public class AsyncFastFibonacci { } } } -// [END goldensample_generated_deprecatedserviceclient_fastfibonacci_async] +// [END goldensample_generated_DeprecatedService_FastFibonacci_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden index fdb781354b..3e4f69d714 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_slowfibonacci_async] +// [START goldensample_generated_DeprecatedService_SlowFibonacci_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; @@ -42,4 +42,4 @@ public class AsyncSlowFibonacci { } } } -// [END goldensample_generated_deprecatedserviceclient_slowfibonacci_async] +// [END goldensample_generated_DeprecatedService_SlowFibonacci_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden index 2d9e73b891..34f20df610 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_create_setcredentialsprovider_sync] +// [START goldensample_generated_DeprecatedService_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.DeprecatedServiceSettings; @@ -42,4 +42,4 @@ public class SyncCreateSetCredentialsProvider { DeprecatedServiceClient.create(deprecatedServiceSettings); } } -// [END goldensample_generated_deprecatedserviceclient_create_setcredentialsprovider_sync] +// [END goldensample_generated_DeprecatedService_Create_SetCredentialsProvider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden index 24400c927b..8d5f08f8af 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_create_setendpoint_sync] +// [START goldensample_generated_DeprecatedService_Create_SetEndpoint_sync] import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.DeprecatedServiceSettings; import com.google.testdata.v1.myEndpoint; @@ -39,4 +39,4 @@ public class SyncCreateSetEndpoint { DeprecatedServiceClient.create(deprecatedServiceSettings); } } -// [END goldensample_generated_deprecatedserviceclient_create_setendpoint_sync] +// [END goldensample_generated_DeprecatedService_Create_SetEndpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden index e05200321d..e067991442 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_fastfibonacci_sync] +// [START goldensample_generated_DeprecatedService_FastFibonacci_sync] import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.FibonacciRequest; @@ -39,4 +39,4 @@ public class SyncFastFibonacci { } } } -// [END goldensample_generated_deprecatedserviceclient_fastfibonacci_sync] +// [END goldensample_generated_DeprecatedService_FastFibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden index d9f5432437..a6dfe7ece4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedserviceclient_slowfibonacci_sync] +// [START goldensample_generated_DeprecatedService_SlowFibonacci_sync] import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.FibonacciRequest; @@ -39,4 +39,4 @@ public class SyncSlowFibonacci { } } } -// [END goldensample_generated_deprecatedserviceclient_slowfibonacci_sync] +// [END goldensample_generated_DeprecatedService_SlowFibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden index c62c2f43d8..fcb7690270 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_block_async] +// [START goldensample_generated_Echo_Block_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.BlockRequest; import com.google.showcase.v1beta1.BlockResponse; @@ -42,4 +42,4 @@ public class AsyncBlock { } } } -// [END goldensample_generated_echoclient_block_async] +// [END goldensample_generated_Echo_Block_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden index 8b359c46f5..2ef5f41da6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_chat_async] +// [START goldensample_generated_Echo_Chat_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -53,4 +53,4 @@ public class AsyncChat { } } } -// [END goldensample_generated_echoclient_chat_async] +// [END goldensample_generated_Echo_Chat_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden index 90331b833e..4e8eaa63f4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_chatagain_async] +// [START goldensample_generated_Echo_ChatAgain_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -53,4 +53,4 @@ public class AsyncChatAgain { } } } -// [END goldensample_generated_echoclient_chatagain_async] +// [END goldensample_generated_Echo_ChatAgain_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden index d51c9aeae2..b2ff87a8c4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_collect_async] +// [START goldensample_generated_Echo_Collect_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -68,4 +68,4 @@ public class AsyncCollect { } } } -// [END goldensample_generated_echoclient_collect_async] +// [END goldensample_generated_Echo_Collect_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden index a2886c0001..8a13eb4386 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_collidename_async] +// [START goldensample_generated_Echo_CollideName_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -51,4 +51,4 @@ public class AsyncCollideName { } } } -// [END goldensample_generated_echoclient_collidename_async] +// [END goldensample_generated_Echo_CollideName_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden index 4ee2bc4cd1..1188e05d7e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_async] +// [START goldensample_generated_Echo_Echo_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -51,4 +51,4 @@ public class AsyncEcho { } } } -// [END goldensample_generated_echoclient_echo_async] +// [END goldensample_generated_Echo_Echo_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden index 51d367798c..3d804cf625 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_expand_async] +// [START goldensample_generated_Echo_Expand_async] import com.google.api.gax.rpc.ServerStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -44,4 +44,4 @@ public class AsyncExpand { } } } -// [END goldensample_generated_echoclient_expand_async] +// [END goldensample_generated_Echo_Expand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden index 0e8b197ad3..653f0c2489 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_pagedexpand_async] +// [START goldensample_generated_Echo_PagedExpand_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -49,4 +49,4 @@ public class AsyncPagedExpand { } } } -// [END goldensample_generated_echoclient_pagedexpand_async] +// [END goldensample_generated_Echo_PagedExpand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden index 0ae0cab7d6..854477fe8f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_pagedexpand_paged_async] +// [START goldensample_generated_Echo_PagedExpand_Paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -57,4 +57,4 @@ public class AsyncPagedExpandPaged { } } } -// [END goldensample_generated_echoclient_pagedexpand_paged_async] +// [END goldensample_generated_Echo_PagedExpand_Paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden index e944abb1a3..d0decc78d6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_simplepagedexpand_async] +// [START goldensample_generated_Echo_SimplePagedExpand_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -50,4 +50,4 @@ public class AsyncSimplePagedExpand { } } } -// [END goldensample_generated_echoclient_simplepagedexpand_async] +// [END goldensample_generated_Echo_SimplePagedExpand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden index 058295f62e..0ab1bb2620 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_simplepagedexpand_paged_async] +// [START goldensample_generated_Echo_SimplePagedExpand_Paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -57,4 +57,4 @@ public class AsyncSimplePagedExpandPaged { } } } -// [END goldensample_generated_echoclient_simplepagedexpand_paged_async] +// [END goldensample_generated_Echo_SimplePagedExpand_Paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden index 0bb588d43a..b433d3de7b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_wait_async] +// [START goldensample_generated_Echo_Wait_async] import com.google.api.core.ApiFuture; import com.google.longrunning.Operation; import com.google.showcase.v1beta1.EchoClient; @@ -42,4 +42,4 @@ public class AsyncWait { } } } -// [END goldensample_generated_echoclient_wait_async] +// [END goldensample_generated_Echo_Wait_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden index 205131670a..ee7219e6a5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_wait_lro_async] +// [START goldensample_generated_Echo_Wait_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitMetadata; @@ -44,4 +44,4 @@ public class AsyncWaitLRO { } } } -// [END goldensample_generated_echoclient_wait_lro_async] +// [END goldensample_generated_Echo_Wait_LRO_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden index f77e29adf9..49083f06a5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_block_sync] +// [START goldensample_generated_Echo_Block_sync] import com.google.showcase.v1beta1.BlockRequest; import com.google.showcase.v1beta1.BlockResponse; import com.google.showcase.v1beta1.EchoClient; @@ -39,4 +39,4 @@ public class SyncBlock { } } } -// [END goldensample_generated_echoclient_block_sync] +// [END goldensample_generated_Echo_Block_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden index 5d412efe85..f54228fe7b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_collidename_sync] +// [START goldensample_generated_Echo_CollideName_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; import com.google.showcase.v1beta1.Foobar; @@ -48,4 +48,4 @@ public class SyncCollideName { } } } -// [END goldensample_generated_echoclient_collidename_sync] +// [END goldensample_generated_Echo_CollideName_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden index fbcaeceee3..137d71af02 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_create_setcredentialsprovider_sync] +// [START goldensample_generated_Echo_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { EchoClient echoClient = EchoClient.create(echoSettings); } } -// [END goldensample_generated_echoclient_create_setcredentialsprovider_sync] +// [END goldensample_generated_Echo_Create_SetCredentialsProvider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden index 7e5bdd85c8..b6a2ea7d5b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_create_setendpoint_sync] +// [START goldensample_generated_Echo_Create_SetEndpoint_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import com.google.showcase.v1beta1.myEndpoint; @@ -37,4 +37,4 @@ public class SyncCreateSetEndpoint { EchoClient echoClient = EchoClient.create(echoSettings); } } -// [END goldensample_generated_echoclient_create_setendpoint_sync] +// [END goldensample_generated_Echo_Create_SetEndpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden index 404cd05a88..c17dbf2e4a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_sync] +// [START goldensample_generated_Echo_Echo_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; import com.google.showcase.v1beta1.EchoResponse; @@ -48,4 +48,4 @@ public class SyncEcho { } } } -// [END goldensample_generated_echoclient_echo_sync] +// [END goldensample_generated_Echo_Echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden index 99d0105b4d..dd60585688 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_foobarname_sync] +// [START goldensample_generated_Echo_Echo_Foobarname_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoFoobarname { } } } -// [END goldensample_generated_echoclient_echo_foobarname_sync] +// [END goldensample_generated_Echo_Echo_Foobarname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden index 1939f2941f..7876817dac 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_noargs_sync] +// [START goldensample_generated_Echo_Echo_Noargs_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -37,4 +37,4 @@ public class SyncEchoNoargs { } } } -// [END goldensample_generated_echoclient_echo_noargs_sync] +// [END goldensample_generated_Echo_Echo_Noargs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden index a6bff404df..8f06e73ae8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_resourcename_sync] +// [START goldensample_generated_Echo_Echo_Resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -40,4 +40,4 @@ public class SyncEchoResourcename { } } } -// [END goldensample_generated_echoclient_echo_resourcename_sync] +// [END goldensample_generated_Echo_Echo_Resourcename_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden index b9471f8203..292f2fd990 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_status_sync] +// [START goldensample_generated_Echo_Echo_Status_sync] import com.google.rpc.Status; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -39,4 +39,4 @@ public class SyncEchoStatus { } } } -// [END goldensample_generated_echoclient_echo_status_sync] +// [END goldensample_generated_Echo_Echo_Status_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden index bb9c0bc308..32f664871e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_string_sync] +// [START goldensample_generated_Echo_Echo_String_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -38,4 +38,4 @@ public class SyncEchoString { } } } -// [END goldensample_generated_echoclient_echo_string_sync] +// [END goldensample_generated_Echo_Echo_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden index 8bc3c4036c..96630803f2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_string1_sync] +// [START goldensample_generated_Echo_Echo_String1_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoString1 { } } } -// [END goldensample_generated_echoclient_echo_string1_sync] +// [END goldensample_generated_Echo_Echo_String1_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden index 268b1c769e..eccc2e54f9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_string2_sync] +// [START goldensample_generated_Echo_Echo_String2_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoString2 { } } } -// [END goldensample_generated_echoclient_echo_string2_sync] +// [END goldensample_generated_Echo_Echo_String2_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden index 5a62b9f4ad..966053a99d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_echo_stringseverity_sync] +// [START goldensample_generated_Echo_Echo_StringSeverity_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.Severity; @@ -40,4 +40,4 @@ public class SyncEchoStringSeverity { } } } -// [END goldensample_generated_echoclient_echo_stringseverity_sync] +// [END goldensample_generated_Echo_Echo_StringSeverity_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden index 4ae90f53cc..b30d626699 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_pagedexpand_sync] +// [START goldensample_generated_Echo_PagedExpand_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.PagedExpandRequest; @@ -46,4 +46,4 @@ public class SyncPagedExpand { } } } -// [END goldensample_generated_echoclient_pagedexpand_sync] +// [END goldensample_generated_Echo_PagedExpand_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden index 11bc4352c5..ba9caf6133 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_simplepagedexpand_sync] +// [START goldensample_generated_Echo_SimplePagedExpand_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.PagedExpandRequest; @@ -46,4 +46,4 @@ public class SyncSimplePagedExpand { } } } -// [END goldensample_generated_echoclient_simplepagedexpand_sync] +// [END goldensample_generated_Echo_SimplePagedExpand_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden index 40ef059d89..050f9b3d74 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_simplepagedexpand_noargs_sync] +// [START goldensample_generated_Echo_SimplePagedExpand_Noargs_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -39,4 +39,4 @@ public class SyncSimplePagedExpandNoargs { } } } -// [END goldensample_generated_echoclient_simplepagedexpand_noargs_sync] +// [END goldensample_generated_Echo_SimplePagedExpand_Noargs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden index 07679a60e1..426785177c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_wait_sync] +// [START goldensample_generated_Echo_Wait_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitRequest; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWait { } } } -// [END goldensample_generated_echoclient_wait_sync] +// [END goldensample_generated_Echo_Wait_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden index 9bec9d30ef..c045e0e3ec 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_wait_duration_sync] +// [START goldensample_generated_Echo_Wait_Duration_sync] import com.google.protobuf.Duration; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWaitDuration { } } } -// [END goldensample_generated_echoclient_wait_duration_sync] +// [END goldensample_generated_Echo_Wait_Duration_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden index 58e6f3464c..c4cfdca153 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echoclient_wait_timestamp_sync] +// [START goldensample_generated_Echo_Wait_Timestamp_sync] import com.google.protobuf.Timestamp; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWaitTimestamp { } } } -// [END goldensample_generated_echoclient_wait_timestamp_sync] +// [END goldensample_generated_Echo_Wait_Timestamp_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden index 5746bce725..42b3f90307 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_createuser_async] +// [START goldensample_generated_Identity_CreateUser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.CreateUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -47,4 +47,4 @@ public class AsyncCreateUser { } } } -// [END goldensample_generated_identityclient_createuser_async] +// [END goldensample_generated_Identity_CreateUser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden index e2a2d79316..09d4bf8625 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_deleteuser_async] +// [START goldensample_generated_Identity_DeleteUser_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteUserRequest; @@ -44,4 +44,4 @@ public class AsyncDeleteUser { } } } -// [END goldensample_generated_identityclient_deleteuser_async] +// [END goldensample_generated_Identity_DeleteUser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden index fe848f43d2..ab82342d69 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_getuser_async] +// [START goldensample_generated_Identity_GetUser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.GetUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -44,4 +44,4 @@ public class AsyncGetUser { } } } -// [END goldensample_generated_identityclient_getuser_async] +// [END goldensample_generated_Identity_GetUser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden index a5aa944c8f..07b5e7b761 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_listusers_async] +// [START goldensample_generated_Identity_ListUsers_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; @@ -48,4 +48,4 @@ public class AsyncListUsers { } } } -// [END goldensample_generated_identityclient_listusers_async] +// [END goldensample_generated_Identity_ListUsers_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden index 9b7cafa65d..2dd52c01a9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_listusers_paged_async] +// [START goldensample_generated_Identity_ListUsers_Paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; @@ -56,4 +56,4 @@ public class AsyncListUsersPaged { } } } -// [END goldensample_generated_identityclient_listusers_paged_async] +// [END goldensample_generated_Identity_ListUsers_Paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden index be44912297..6a77b3f29d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_updateuser_async] +// [START goldensample_generated_Identity_UpdateUser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UpdateUserRequest; @@ -43,4 +43,4 @@ public class AsyncUpdateUser { } } } -// [END goldensample_generated_identityclient_updateuser_async] +// [END goldensample_generated_Identity_UpdateUser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden index f859c452de..170fb27fb1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_create_setcredentialsprovider_sync] +// [START goldensample_generated_Identity_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.IdentitySettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { IdentityClient identityClient = IdentityClient.create(identitySettings); } } -// [END goldensample_generated_identityclient_create_setcredentialsprovider_sync] +// [END goldensample_generated_Identity_Create_SetCredentialsProvider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden index 015f9dfcd7..33dd94a49b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_create_setendpoint_sync] +// [START goldensample_generated_Identity_Create_SetEndpoint_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.IdentitySettings; import com.google.showcase.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { IdentityClient identityClient = IdentityClient.create(identitySettings); } } -// [END goldensample_generated_identityclient_create_setendpoint_sync] +// [END goldensample_generated_Identity_Create_SetEndpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden index 7d8c03e141..7fb81d997e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_createuser_sync] +// [START goldensample_generated_Identity_CreateUser_sync] import com.google.showcase.v1beta1.CreateUserRequest; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; @@ -44,4 +44,4 @@ public class SyncCreateUser { } } } -// [END goldensample_generated_identityclient_createuser_sync] +// [END goldensample_generated_Identity_CreateUser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden index d8b266a31a..39feaa06d3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_createuser_stringstringstring_sync] +// [START goldensample_generated_Identity_CreateUser_StringStringString_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -41,4 +41,4 @@ public class SyncCreateUserStringStringString { } } } -// [END goldensample_generated_identityclient_createuser_stringstringstring_sync] +// [END goldensample_generated_Identity_CreateUser_StringStringString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden index 6556a596f1..338a1262a2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_createuser_stringstringstringintstringbooleandouble_sync] +// [START goldensample_generated_Identity_CreateUser_StringStringStringIntStringBooleanDouble_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -47,4 +47,4 @@ public class SyncCreateUserStringStringStringIntStringBooleanDouble { } } } -// [END goldensample_generated_identityclient_createuser_stringstringstringintstringbooleandouble_sync] +// [END goldensample_generated_Identity_CreateUser_StringStringStringIntStringBooleanDouble_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden index ac1a283fd2..e56b757fe6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_createuser_stringstringstringstringstringintstringstringstringstring_sync] +// [START goldensample_generated_Identity_CreateUser_StringStringStringStringStringIntStringStringStringString_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -60,4 +60,4 @@ public class SyncCreateUserStringStringStringStringStringIntStringStringStringSt } } } -// [END goldensample_generated_identityclient_createuser_stringstringstringstringstringintstringstringstringstring_sync] +// [END goldensample_generated_Identity_CreateUser_StringStringStringStringStringIntStringStringStringString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden index 53c45c3cbb..1142599cce 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_deleteuser_sync] +// [START goldensample_generated_Identity_DeleteUser_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -41,4 +41,4 @@ public class SyncDeleteUser { } } } -// [END goldensample_generated_identityclient_deleteuser_sync] +// [END goldensample_generated_Identity_DeleteUser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden index eece238c02..a809efb619 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_deleteuser_string_sync] +// [START goldensample_generated_Identity_DeleteUser_String_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncDeleteUserString { } } } -// [END goldensample_generated_identityclient_deleteuser_string_sync] +// [END goldensample_generated_Identity_DeleteUser_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden index b5be27d6ef..742b1e748c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_deleteuser_username_sync] +// [START goldensample_generated_Identity_DeleteUser_Username_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncDeleteUserUsername { } } } -// [END goldensample_generated_identityclient_deleteuser_username_sync] +// [END goldensample_generated_Identity_DeleteUser_Username_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden index b1365f3b99..e3bf802301 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_getuser_sync] +// [START goldensample_generated_Identity_GetUser_sync] import com.google.showcase.v1beta1.GetUserRequest; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; @@ -41,4 +41,4 @@ public class SyncGetUser { } } } -// [END goldensample_generated_identityclient_getuser_sync] +// [END goldensample_generated_Identity_GetUser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden index 44a6a17256..73c4cf2bba 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_getuser_string_sync] +// [START goldensample_generated_Identity_GetUser_String_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncGetUserString { } } } -// [END goldensample_generated_identityclient_getuser_string_sync] +// [END goldensample_generated_Identity_GetUser_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden index 409787850e..4af40f648d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_getuser_username_sync] +// [START goldensample_generated_Identity_GetUser_Username_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncGetUserUsername { } } } -// [END goldensample_generated_identityclient_getuser_username_sync] +// [END goldensample_generated_Identity_GetUser_Username_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden index 1fa89b2cf7..d111584331 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_listusers_sync] +// [START goldensample_generated_Identity_ListUsers_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; import com.google.showcase.v1beta1.User; @@ -45,4 +45,4 @@ public class SyncListUsers { } } } -// [END goldensample_generated_identityclient_listusers_sync] +// [END goldensample_generated_Identity_ListUsers_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden index 919953f762..beca349fe1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_identityclient_updateuser_sync] +// [START goldensample_generated_Identity_UpdateUser_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UpdateUserRequest; import com.google.showcase.v1beta1.User; @@ -40,4 +40,4 @@ public class SyncUpdateUser { } } } -// [END goldensample_generated_identityclient_updateuser_sync] +// [END goldensample_generated_Identity_UpdateUser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden index 7c844cce85..1527fbf21c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_connect_async] +// [START goldensample_generated_Messaging_Connect_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.ConnectRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -45,4 +45,4 @@ public class AsyncConnect { } } } -// [END goldensample_generated_messagingclient_connect_async] +// [END goldensample_generated_Messaging_Connect_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden index f015b74a58..7d4dedad14 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_async] +// [START goldensample_generated_Messaging_CreateBlurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; @@ -47,4 +47,4 @@ public class AsyncCreateBlurb { } } } -// [END goldensample_generated_messagingclient_createblurb_async] +// [END goldensample_generated_Messaging_CreateBlurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden index e0dc0aedac..0b97e48893 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createroom_async] +// [START goldensample_generated_Messaging_CreateRoom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.CreateRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -43,4 +43,4 @@ public class AsyncCreateRoom { } } } -// [END goldensample_generated_messagingclient_createroom_async] +// [END goldensample_generated_Messaging_CreateRoom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden index 8eabcc893a..541b576c49 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteblurb_async] +// [START goldensample_generated_Messaging_DeleteBlurb_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; @@ -46,4 +46,4 @@ public class AsyncDeleteBlurb { } } } -// [END goldensample_generated_messagingclient_deleteblurb_async] +// [END goldensample_generated_Messaging_DeleteBlurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden index ebe5be44c2..a848b99195 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteroom_async] +// [START goldensample_generated_Messaging_DeleteRoom_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteRoomRequest; @@ -44,4 +44,4 @@ public class AsyncDeleteRoom { } } } -// [END goldensample_generated_messagingclient_deleteroom_async] +// [END goldensample_generated_Messaging_DeleteRoom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden index 627465df2d..91561164d4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getblurb_async] +// [START goldensample_generated_Messaging_GetBlurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; @@ -46,4 +46,4 @@ public class AsyncGetBlurb { } } } -// [END goldensample_generated_messagingclient_getblurb_async] +// [END goldensample_generated_Messaging_GetBlurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden index caa0b727de..e18adcb4fe 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getroom_async] +// [START goldensample_generated_Messaging_GetRoom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.GetRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -44,4 +44,4 @@ public class AsyncGetRoom { } } } -// [END goldensample_generated_messagingclient_getroom_async] +// [END goldensample_generated_Messaging_GetRoom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden index 1f2eb73d9d..f61cbee5ec 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_async] +// [START goldensample_generated_Messaging_ListBlurbs_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; @@ -50,4 +50,4 @@ public class AsyncListBlurbs { } } } -// [END goldensample_generated_messagingclient_listblurbs_async] +// [END goldensample_generated_Messaging_ListBlurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden index 37928394c7..261b3be58b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_paged_async] +// [START goldensample_generated_Messaging_ListBlurbs_Paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; @@ -58,4 +58,4 @@ public class AsyncListBlurbsPaged { } } } -// [END goldensample_generated_messagingclient_listblurbs_paged_async] +// [END goldensample_generated_Messaging_ListBlurbs_Paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden index a658df0fae..0fa5c5dd31 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listrooms_async] +// [START goldensample_generated_Messaging_ListRooms_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -48,4 +48,4 @@ public class AsyncListRooms { } } } -// [END goldensample_generated_messagingclient_listrooms_async] +// [END goldensample_generated_Messaging_ListRooms_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden index 58686d44a7..83a9c04205 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listrooms_paged_async] +// [START goldensample_generated_Messaging_ListRooms_Paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.ListRoomsResponse; @@ -56,4 +56,4 @@ public class AsyncListRoomsPaged { } } } -// [END goldensample_generated_messagingclient_listrooms_paged_async] +// [END goldensample_generated_Messaging_ListRooms_Paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden index 6161b2e104..a492728b11 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_searchblurbs_async] +// [START goldensample_generated_Messaging_SearchBlurbs_async] import com.google.api.core.ApiFuture; import com.google.longrunning.Operation; import com.google.showcase.v1beta1.MessagingClient; @@ -49,4 +49,4 @@ public class AsyncSearchBlurbs { } } } -// [END goldensample_generated_messagingclient_searchblurbs_async] +// [END goldensample_generated_Messaging_SearchBlurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden index 73dac257ea..c4db52aceb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_searchblurbs_lro_async] +// [START goldensample_generated_Messaging_SearchBlurbs_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -51,4 +51,4 @@ public class AsyncSearchBlurbsLRO { } } } -// [END goldensample_generated_messagingclient_searchblurbs_lro_async] +// [END goldensample_generated_Messaging_SearchBlurbs_LRO_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden index 6f608c23dc..9275afa82b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_sendblurbs_async] +// [START goldensample_generated_Messaging_SendBlurbs_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; @@ -65,4 +65,4 @@ public class AsyncSendBlurbs { } } } -// [END goldensample_generated_messagingclient_sendblurbs_async] +// [END goldensample_generated_Messaging_SendBlurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden index 6588736a1d..eeefc7952e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_streamblurbs_async] +// [START goldensample_generated_Messaging_StreamBlurbs_async] import com.google.api.gax.rpc.ServerStream; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -46,4 +46,4 @@ public class AsyncStreamBlurbs { } } } -// [END goldensample_generated_messagingclient_streamblurbs_async] +// [END goldensample_generated_Messaging_StreamBlurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden index c7e73b8638..f7b197c194 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_updateblurb_async] +// [START goldensample_generated_Messaging_UpdateBlurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -43,4 +43,4 @@ public class AsyncUpdateBlurb { } } } -// [END goldensample_generated_messagingclient_updateblurb_async] +// [END goldensample_generated_Messaging_UpdateBlurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden index c8bc11c5ba..7bdf9bed17 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_updateroom_async] +// [START goldensample_generated_Messaging_UpdateRoom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -43,4 +43,4 @@ public class AsyncUpdateRoom { } } } -// [END goldensample_generated_messagingclient_updateroom_async] +// [END goldensample_generated_Messaging_UpdateRoom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden index 00fb6d9940..57d0f0c180 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_sync] +// [START goldensample_generated_Messaging_CreateBlurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -44,4 +44,4 @@ public class SyncCreateBlurb { } } } -// [END goldensample_generated_messagingclient_createblurb_sync] +// [END goldensample_generated_Messaging_CreateBlurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden index f9d342accf..ab5a62701c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_profilenamebytestring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_ProfilenameBytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbProfilenameBytestring { } } } -// [END goldensample_generated_messagingclient_createblurb_profilenamebytestring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_ProfilenameBytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden index f165c7ef76..a7efb77b5d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_profilenamestring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_ProfilenameString_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbProfilenameString { } } } -// [END goldensample_generated_messagingclient_createblurb_profilenamestring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_ProfilenameString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden index 2818243a50..143145ac95 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_roomnamebytestring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_RoomnameBytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbRoomnameBytestring { } } } -// [END goldensample_generated_messagingclient_createblurb_roomnamebytestring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_RoomnameBytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden index f05bd4f87b..8b7d8c6bbf 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_roomnamestring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_RoomnameString_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbRoomnameString { } } } -// [END goldensample_generated_messagingclient_createblurb_roomnamestring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_RoomnameString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden index 3e630a4b15..08e2fc9a9b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_stringbytestring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_StringBytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbStringBytestring { } } } -// [END goldensample_generated_messagingclient_createblurb_stringbytestring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_StringBytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden index 562d27535a..f77ae6eb0f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createblurb_stringstring_sync] +// [START goldensample_generated_Messaging_CreateBlurb_StringString_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbStringString { } } } -// [END goldensample_generated_messagingclient_createblurb_stringstring_sync] +// [END goldensample_generated_Messaging_CreateBlurb_StringString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden index 57b517225b..f1ac7b0bf8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createroom_sync] +// [START goldensample_generated_Messaging_CreateRoom_sync] import com.google.showcase.v1beta1.CreateRoomRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -40,4 +40,4 @@ public class SyncCreateRoom { } } } -// [END goldensample_generated_messagingclient_createroom_sync] +// [END goldensample_generated_Messaging_CreateRoom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden index ebcc0cc72d..05a335d704 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_createroom_stringstring_sync] +// [START goldensample_generated_Messaging_CreateRoom_StringString_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -39,4 +39,4 @@ public class SyncCreateRoomStringString { } } } -// [END goldensample_generated_messagingclient_createroom_stringstring_sync] +// [END goldensample_generated_Messaging_CreateRoom_StringString_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden index ae4425a5e1..2707298f00 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_create_setcredentialsprovider_sync] +// [START goldensample_generated_Messaging_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.MessagingSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { MessagingClient messagingClient = MessagingClient.create(messagingSettings); } } -// [END goldensample_generated_messagingclient_create_setcredentialsprovider_sync] +// [END goldensample_generated_Messaging_Create_SetCredentialsProvider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden index 8bc4e45e0b..53141d54ff 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_create_setendpoint_sync] +// [START goldensample_generated_Messaging_Create_SetEndpoint_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.MessagingSettings; import com.google.showcase.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { MessagingClient messagingClient = MessagingClient.create(messagingSettings); } } -// [END goldensample_generated_messagingclient_create_setendpoint_sync] +// [END goldensample_generated_Messaging_Create_SetEndpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden index c641dd9272..16d8a41623 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteblurb_sync] +// [START goldensample_generated_Messaging_DeleteBlurb_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.DeleteBlurbRequest; @@ -43,4 +43,4 @@ public class SyncDeleteBlurb { } } } -// [END goldensample_generated_messagingclient_deleteblurb_sync] +// [END goldensample_generated_Messaging_DeleteBlurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden index f6a585d8be..752875d995 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteblurb_blurbname_sync] +// [START goldensample_generated_Messaging_DeleteBlurb_Blurbname_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -39,4 +39,4 @@ public class SyncDeleteBlurbBlurbname { } } } -// [END goldensample_generated_messagingclient_deleteblurb_blurbname_sync] +// [END goldensample_generated_Messaging_DeleteBlurb_Blurbname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden index 16378885d7..c52c8d070f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteblurb_string_sync] +// [START goldensample_generated_Messaging_DeleteBlurb_String_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -40,4 +40,4 @@ public class SyncDeleteBlurbString { } } } -// [END goldensample_generated_messagingclient_deleteblurb_string_sync] +// [END goldensample_generated_Messaging_DeleteBlurb_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden index 23baa1c773..621d024d15 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteroom_sync] +// [START goldensample_generated_Messaging_DeleteRoom_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncDeleteRoom { } } } -// [END goldensample_generated_messagingclient_deleteroom_sync] +// [END goldensample_generated_Messaging_DeleteRoom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden index 91d32081b9..bd203c1483 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteroom_roomname_sync] +// [START goldensample_generated_Messaging_DeleteRoom_Roomname_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncDeleteRoomRoomname { } } } -// [END goldensample_generated_messagingclient_deleteroom_roomname_sync] +// [END goldensample_generated_Messaging_DeleteRoom_Roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden index b9e4c5883d..d65c2b43dd 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_deleteroom_string_sync] +// [START goldensample_generated_Messaging_DeleteRoom_String_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncDeleteRoomString { } } } -// [END goldensample_generated_messagingclient_deleteroom_string_sync] +// [END goldensample_generated_Messaging_DeleteRoom_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden index 0983642a83..16570a645d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getblurb_sync] +// [START goldensample_generated_Messaging_GetBlurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.GetBlurbRequest; @@ -43,4 +43,4 @@ public class SyncGetBlurb { } } } -// [END goldensample_generated_messagingclient_getblurb_sync] +// [END goldensample_generated_Messaging_GetBlurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden index cf2f6fbacb..012a36a6da 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getblurb_blurbname_sync] +// [START goldensample_generated_Messaging_GetBlurb_Blurbname_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -39,4 +39,4 @@ public class SyncGetBlurbBlurbname { } } } -// [END goldensample_generated_messagingclient_getblurb_blurbname_sync] +// [END goldensample_generated_Messaging_GetBlurb_Blurbname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden index f82f4e7bc1..ec7957a5d6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getblurb_string_sync] +// [START goldensample_generated_Messaging_GetBlurb_String_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -40,4 +40,4 @@ public class SyncGetBlurbString { } } } -// [END goldensample_generated_messagingclient_getblurb_string_sync] +// [END goldensample_generated_Messaging_GetBlurb_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden index 78b7d13b61..12aef664c1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getroom_sync] +// [START goldensample_generated_Messaging_GetRoom_sync] import com.google.showcase.v1beta1.GetRoomRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -41,4 +41,4 @@ public class SyncGetRoom { } } } -// [END goldensample_generated_messagingclient_getroom_sync] +// [END goldensample_generated_Messaging_GetRoom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden index 56da552417..b732876cb2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getroom_roomname_sync] +// [START goldensample_generated_Messaging_GetRoom_Roomname_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncGetRoomRoomname { } } } -// [END goldensample_generated_messagingclient_getroom_roomname_sync] +// [END goldensample_generated_Messaging_GetRoom_Roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden index f35f28cc90..ce6113ed1a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_getroom_string_sync] +// [START goldensample_generated_Messaging_GetRoom_String_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncGetRoomString { } } } -// [END goldensample_generated_messagingclient_getroom_string_sync] +// [END goldensample_generated_Messaging_GetRoom_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden index cfc50e8565..af34fdbf29 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_sync] +// [START goldensample_generated_Messaging_ListBlurbs_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -47,4 +47,4 @@ public class SyncListBlurbs { } } } -// [END goldensample_generated_messagingclient_listblurbs_sync] +// [END goldensample_generated_Messaging_ListBlurbs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden index dfd515f13f..ce95287fb5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_profilename_sync] +// [START goldensample_generated_Messaging_ListBlurbs_Profilename_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -41,4 +41,4 @@ public class SyncListBlurbsProfilename { } } } -// [END goldensample_generated_messagingclient_listblurbs_profilename_sync] +// [END goldensample_generated_Messaging_ListBlurbs_Profilename_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden index 0272c5ea93..f3bac1b2b5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_roomname_sync] +// [START goldensample_generated_Messaging_ListBlurbs_Roomname_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -41,4 +41,4 @@ public class SyncListBlurbsRoomname { } } } -// [END goldensample_generated_messagingclient_listblurbs_roomname_sync] +// [END goldensample_generated_Messaging_ListBlurbs_Roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden index 67d02e0c28..89f24d8d1b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listblurbs_string_sync] +// [START goldensample_generated_Messaging_ListBlurbs_String_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -41,4 +41,4 @@ public class SyncListBlurbsString { } } } -// [END goldensample_generated_messagingclient_listblurbs_string_sync] +// [END goldensample_generated_Messaging_ListBlurbs_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden index 780a3fd213..0318e80856 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_listrooms_sync] +// [START goldensample_generated_Messaging_ListRooms_sync] import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -45,4 +45,4 @@ public class SyncListRooms { } } } -// [END goldensample_generated_messagingclient_listrooms_sync] +// [END goldensample_generated_Messaging_ListRooms_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden index 76bd8b75b6..09e3843acc 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_searchblurbs_sync] +// [START goldensample_generated_Messaging_SearchBlurbs_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; import com.google.showcase.v1beta1.SearchBlurbsRequest; @@ -46,4 +46,4 @@ public class SyncSearchBlurbs { } } } -// [END goldensample_generated_messagingclient_searchblurbs_sync] +// [END goldensample_generated_Messaging_SearchBlurbs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden index 6ba0ae6e5a..2fbae35501 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_searchblurbs_string_sync] +// [START goldensample_generated_Messaging_SearchBlurbs_String_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.SearchBlurbsResponse; @@ -38,4 +38,4 @@ public class SyncSearchBlurbsString { } } } -// [END goldensample_generated_messagingclient_searchblurbs_string_sync] +// [END goldensample_generated_Messaging_SearchBlurbs_String_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden index eeaaa911d0..cc949cd2e2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_updateblurb_sync] +// [START goldensample_generated_Messaging_UpdateBlurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.UpdateBlurbRequest; @@ -40,4 +40,4 @@ public class SyncUpdateBlurb { } } } -// [END goldensample_generated_messagingclient_updateblurb_sync] +// [END goldensample_generated_Messaging_UpdateBlurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden index 7999de51dc..f532f73957 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_messagingclient_updateroom_sync] +// [START goldensample_generated_Messaging_UpdateRoom_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.UpdateRoomRequest; @@ -40,4 +40,4 @@ public class SyncUpdateRoom { } } } -// [END goldensample_generated_messagingclient_updateroom_sync] +// [END goldensample_generated_Messaging_UpdateRoom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden index 9cbdba2f24..5d031b7c77 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_echosettings_echo_sync] +// [START goldensample_generated_EchoSettings_Echo_sync] import com.google.showcase.v1beta1.EchoSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncEcho { EchoSettings echoSettings = echoSettingsBuilder.build(); } } -// [END goldensample_generated_echosettings_echo_sync] +// [END goldensample_generated_EchoSettings_Echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden index 325533a9b8..90cd534cee 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_deprecatedservicesettings_fastfibonacci_sync] +// [START goldensample_generated_DeprecatedServiceSettings_FastFibonacci_sync] import com.google.testdata.v1.DeprecatedServiceSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public class SyncFastFibonacci { DeprecatedServiceSettings deprecatedServiceSettings = deprecatedServiceSettingsBuilder.build(); } } -// [END goldensample_generated_deprecatedservicesettings_fastfibonacci_sync] +// [END goldensample_generated_DeprecatedServiceSettings_FastFibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden index 0d33be22fe..7417d5b42e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden @@ -16,7 +16,7 @@ package com.google.pubsub.v1.stub.samples; -// [START goldensample_generated_publisherstubsettings_createtopic_sync] +// [START goldensample_generated_PublisherStubSettings_CreateTopic_sync] import com.google.pubsub.v1.stub.PublisherStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncCreateTopic { PublisherStubSettings publisherSettings = publisherSettingsBuilder.build(); } } -// [END goldensample_generated_publisherstubsettings_createtopic_sync] +// [END goldensample_generated_PublisherStubSettings_CreateTopic_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden index bc1c42a9fd..a72b00ae23 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden @@ -16,7 +16,7 @@ package com.google.logging.v2.stub.samples; -// [START goldensample_generated_loggingservicev2stubsettings_deletelog_sync] +// [START goldensample_generated_LoggingServiceV2StubSettings_DeleteLog_sync] import com.google.logging.v2.stub.LoggingServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public class SyncDeleteLog { LoggingServiceV2StubSettings loggingServiceV2Settings = loggingServiceV2SettingsBuilder.build(); } } -// [END goldensample_generated_loggingservicev2stubsettings_deletelog_sync] +// [END goldensample_generated_LoggingServiceV2StubSettings_DeleteLog_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden index 7a97d3f41b..968fb98297 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.stub.samples; -// [START goldensample_generated_echostubsettings_echo_sync] +// [START goldensample_generated_EchoStubSettings_Echo_sync] import com.google.showcase.v1beta1.stub.EchoStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncEcho { EchoStubSettings echoSettings = echoSettingsBuilder.build(); } } -// [END goldensample_generated_echostubsettings_echo_sync] +// [END goldensample_generated_EchoStubSettings_Echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden index 47814df155..042d351178 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.stub.samples; -// [START goldensample_generated_deprecatedservicestubsettings_fastfibonacci_sync] +// [START goldensample_generated_DeprecatedServiceStubSettings_FastFibonacci_sync] import com.google.testdata.v1.stub.DeprecatedServiceStubSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public class SyncFastFibonacci { deprecatedServiceSettingsBuilder.build(); } } -// [END goldensample_generated_deprecatedservicestubsettings_fastfibonacci_sync] +// [END goldensample_generated_DeprecatedServiceStubSettings_FastFibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java index 679b7684a8..d34c2d6714 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java @@ -132,7 +132,7 @@ public void writeExecutableSample() { "\n", "package com.google.samples;\n", "\n", - "// [START testing_v1_generated_samples_write_executablesample_sync]\n", + "// [START testing_v1_generated_Samples_Write_ExecutableSample_sync]\n", "import com.google.api.gax.rpc.ClientSettings;\n", "\n", "public class SyncWriteExecutableSample {\n", @@ -153,7 +153,7 @@ public void writeExecutableSample() { " }\n", " }\n", "}\n", - "// [END testing_v1_generated_samples_write_executablesample_sync]\n"); + "// [END testing_v1_generated_Samples_Write_ExecutableSample_sync]\n"); Assert.assertEquals(expected, result); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java index 99aea60849..726166861d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java @@ -75,7 +75,7 @@ public void createExecutableSampleEmptyStatementSample() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_echo_createexecutablesample_emptystatementsample_sync]\n", + "// [START apiname_generated_Echo_CreateExecutableSample_EmptyStatementSample_sync]\n", "public class SyncCreateExecutableSampleEmptyStatementSample {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -90,7 +90,7 @@ public void createExecutableSampleEmptyStatementSample() { " // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library\n", " }\n", "}\n", - "// [END apiname_generated_echo_createexecutablesample_emptystatementsample_sync]\n"); + "// [END apiname_generated_Echo_CreateExecutableSample_EmptyStatementSample_sync]\n"); assertEquals(expected, sampleResult); } @@ -114,7 +114,7 @@ public void createExecutableSampleMethodArgsNoVar() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_echo_createexecutablesample_methodargsnovar_sync]\n", + "// [START apiname_generated_Echo_CreateExecutableSample_MethodArgsNoVar_sync]\n", "public class SyncCreateExecutableSampleMethodArgsNoVar {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -130,7 +130,7 @@ public void createExecutableSampleMethodArgsNoVar() { " System.out.println(\"Testing CreateExecutableSampleMethodArgsNoVar\");\n", " }\n", "}\n", - "// [END apiname_generated_echo_createexecutablesample_methodargsnovar_sync]\n"); + "// [END apiname_generated_Echo_CreateExecutableSample_MethodArgsNoVar_sync]\n"); assertEquals(expected, sampleResult); } @@ -162,7 +162,7 @@ public void createExecutableSampleMethod() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_echo_createexecutablesample_sync]\n", + "// [START apiname_generated_Echo_CreateExecutableSample_sync]\n", "public class SyncCreateExecutableSample {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -179,7 +179,7 @@ public void createExecutableSampleMethod() { " System.out.println(content);\n", " }\n", "}\n", - "// [END apiname_generated_echo_createexecutablesample_sync]\n"); + "// [END apiname_generated_Echo_CreateExecutableSample_sync]\n"); assertEquals(expected, sampleResult); } @@ -248,7 +248,7 @@ public void createExecutableSampleMethodMultipleStatements() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_echo_createexecutablesample_methodmultiplestatements_sync]\n", + "// [START apiname_generated_Echo_CreateExecutableSample_MethodMultipleStatements_sync]\n", "public class SyncCreateExecutableSampleMethodMultipleStatements {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -270,7 +270,7 @@ public void createExecutableSampleMethodMultipleStatements() { " System.out.println(thing.response());\n", " }\n", "}\n", - "// [END apiname_generated_echo_createexecutablesample_methodmultiplestatements_sync]\n"); + "// [END apiname_generated_Echo_CreateExecutableSample_MethodMultipleStatements_sync]\n"); assertEquals(expected, sampleResult); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java b/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java new file mode 100644 index 0000000000..b393a5bed3 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java @@ -0,0 +1,31 @@ +// 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.utils; + +import org.junit.Assert; +import org.junit.Test; + +public class ClassNamesTest { + @Test + public void getPureServiceName_returnsServiceName() { + Assert.assertEquals(ClassNames.getPureServiceName("EchoClient"), "Echo"); + Assert.assertEquals(ClassNames.getPureServiceName("Echo"), "Echo"); + Assert.assertEquals(ClassNames.getPureServiceName(""), ""); + Assert.assertEquals(ClassNames.getPureServiceName("ClientEcho"), ""); + Assert.assertEquals(ClassNames.getPureServiceName("echoclient"), "echoclient"); + Assert.assertEquals(ClassNames.getPureServiceName("echoClient"), "echo"); + Assert.assertEquals(ClassNames.getPureServiceName("echoServiceClient"), "echoService"); + } +} diff --git a/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java b/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java index a45d206de9..e3a96fbd21 100644 --- a/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java +++ b/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java @@ -104,7 +104,7 @@ public void generateRegionTagsValidMissingFields() { .build(); String result = regionTag.generate(); - String expected = "shortname_generated_servicename_rpcname_sync"; + String expected = "shortname_generated_ServiceName_RpcName_sync"; Assert.assertEquals(expected, result); } @@ -121,7 +121,7 @@ public void generateRegionTagsAllFields() { .build(); String result = regionTag.generate(); - String expected = "shortname_v1_generated_servicename_rpcname_disambiguation_async"; + String expected = "shortname_v1_generated_ServiceName_RpcName_Disambiguation_async"; Assert.assertEquals(expected, result); } @@ -143,8 +143,8 @@ public void generateRegionTagTag() { regionTag.generateTag(RegionTag.RegionTagRegion.END, regionTag.generate()))); String expected = LineFormatter.lines( - "// [START shortname_v1_generated_servicename_rpcname_disambiguation_sync]\n", - "// [END shortname_v1_generated_servicename_rpcname_disambiguation_sync]"); + "// [START shortname_v1_generated_ServiceName_RpcName_Disambiguation_sync]\n", + "// [END shortname_v1_generated_ServiceName_RpcName_Disambiguation_sync]"); Assert.assertEquals(expected, result); } } diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java index f8a8404fb2..481d648922 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_async] +// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicy() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_async] +// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java index 8a1b602a87..c12b5a21e4 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_sync] +// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -45,4 +45,4 @@ public static void syncAnalyzeIamPolicy() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicy_sync] +// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java index a6ce1cb3b7..b7aa241702 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] +// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AssetServiceClient; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] +// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java index 6ae9138184..1cdfa54f62 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] +// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningMetadata; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; @@ -51,4 +51,4 @@ public static void asyncAnalyzeIamPolicyLongrunningLRO() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] +// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_LRO_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java index e2c6cc61bf..713f7e80bf 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] +// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -46,4 +46,4 @@ public static void syncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] +// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java index ac73e77a37..f0d93d7947 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzemove_async] +// [START cloudasset_v1_generated_AssetService_AnalyzeMove_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; @@ -47,4 +47,4 @@ public static void asyncAnalyzeMove() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzemove_async] +// [END cloudasset_v1_generated_AssetService_AnalyzeMove_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java index b79e89dc7c..be0348481f 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_analyzemove_sync] +// [START cloudasset_v1_generated_AssetService_AnalyzeMove_sync] import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -43,4 +43,4 @@ public static void syncAnalyzeMove() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_analyzemove_sync] +// [END cloudasset_v1_generated_AssetService_AnalyzeMove_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java index 63f45e8cca..d031b2073b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_async] +// [START cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; @@ -53,4 +53,4 @@ public static void asyncBatchGetAssetsHistory() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_async] +// [END cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java index b5f15f0651..06719a2b83 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; import com.google.cloud.asset.v1.BatchGetAssetsHistoryResponse; @@ -49,4 +49,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java index 4d4016e4c1..00ad2cefc5 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] +// [START cloudasset_v1_generated_AssetService_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END cloudasset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] +// [END cloudasset_v1_generated_AssetService_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java index edf19aaab1..5ede353237 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_create_setendpoint_sync] +// [START cloudasset_v1_generated_AssetService_Create_SetEndpoint_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; import com.google.cloud.asset.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END cloudasset_v1_generated_assetserviceclient_create_setendpoint_sync] +// [END cloudasset_v1_generated_AssetService_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java index 5c3beea239..f33ae5d4c0 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_createfeed_async] +// [START cloudasset_v1_generated_AssetService_CreateFeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; @@ -47,4 +47,4 @@ public static void asyncCreateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_createfeed_async] +// [END cloudasset_v1_generated_AssetService_CreateFeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java index 9e38918b80..cd83f15a3b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_createfeed_sync] +// [START cloudasset_v1_generated_AssetService_CreateFeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; import com.google.cloud.asset.v1.Feed; @@ -44,4 +44,4 @@ public static void syncCreateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_createfeed_sync] +// [END cloudasset_v1_generated_AssetService_CreateFeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java similarity index 90% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java index dab302c7bf..f6fc682365 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_createfeed_string_sync] +// [START cloudasset_v1_generated_AssetService_CreateFeed_String_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncCreateFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_createfeed_string_sync] +// [END cloudasset_v1_generated_AssetService_CreateFeed_String_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java index 8f08047829..f37354d875 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_deletefeed_async] +// [START cloudasset_v1_generated_AssetService_DeleteFeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_deletefeed_async] +// [END cloudasset_v1_generated_AssetService_DeleteFeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java index b7f134f14a..051f44738c 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_deletefeed_sync] +// [START cloudasset_v1_generated_AssetService_DeleteFeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncDeleteFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_deletefeed_sync] +// [END cloudasset_v1_generated_AssetService_DeleteFeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java index 1722e7491b..ca8460944c 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_deletefeed_feedname_sync] +// [START cloudasset_v1_generated_AssetService_DeleteFeed_Feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedFeedname() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_deletefeed_feedname_sync] +// [END cloudasset_v1_generated_AssetService_DeleteFeed_Feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java index 08ed770e30..7430704233 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_deletefeed_string_sync] +// [START cloudasset_v1_generated_AssetService_DeleteFeed_String_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_deletefeed_string_sync] +// [END cloudasset_v1_generated_AssetService_DeleteFeed_String_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java index 6781343b09..db5d626354 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_exportassets_async] +// [START cloudasset_v1_generated_AssetService_ExportAssets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -54,4 +54,4 @@ public static void asyncExportAssets() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_exportassets_async] +// [END cloudasset_v1_generated_AssetService_ExportAssets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java index c097beb7dc..09d797bd50 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_exportassets_lro_async] +// [START cloudasset_v1_generated_AssetService_ExportAssets_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -55,4 +55,4 @@ public static void asyncExportAssetsLRO() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_exportassets_lro_async] +// [END cloudasset_v1_generated_AssetService_ExportAssets_LRO_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java index ba8621fec4..60b9bc4434 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_exportassets_sync] +// [START cloudasset_v1_generated_AssetService_ExportAssets_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; import com.google.cloud.asset.v1.ExportAssetsRequest; @@ -51,4 +51,4 @@ public static void syncExportAssets() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_exportassets_sync] +// [END cloudasset_v1_generated_AssetService_ExportAssets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java index 4793d5051f..8acd1e2b02 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_getfeed_async] +// [START cloudasset_v1_generated_AssetService_GetFeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -46,4 +46,4 @@ public static void asyncGetFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_getfeed_async] +// [END cloudasset_v1_generated_AssetService_GetFeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java index 49f0b8e475..f6813afc5f 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_getfeed_sync] +// [START cloudasset_v1_generated_AssetService_GetFeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncGetFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_getfeed_sync] +// [END cloudasset_v1_generated_AssetService_GetFeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java index 6e7d947a77..978518747f 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_getfeed_feedname_sync] +// [START cloudasset_v1_generated_AssetService_GetFeed_Feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedFeedname() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_getfeed_feedname_sync] +// [END cloudasset_v1_generated_AssetService_GetFeed_Feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java index c9940d9c27..e85a2f8f77 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_getfeed_string_sync] +// [START cloudasset_v1_generated_AssetService_GetFeed_String_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_getfeed_string_sync] +// [END cloudasset_v1_generated_AssetService_GetFeed_String_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java index 75ae0c197c..d20f247b00 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listassets_async] +// [START cloudasset_v1_generated_AssetService_ListAssets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -56,4 +56,4 @@ public static void asyncListAssets() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listassets_async] +// [END cloudasset_v1_generated_AssetService_ListAssets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java index 903af880c0..ff9fb130ea 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listassets_paged_async] +// [START cloudasset_v1_generated_AssetService_ListAssets_Paged_async] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -64,4 +64,4 @@ public static void asyncListAssetsPaged() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listassets_paged_async] +// [END cloudasset_v1_generated_AssetService_ListAssets_Paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java index 0f257a0265..ce3f71caa0 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listassets_sync] +// [START cloudasset_v1_generated_AssetService_ListAssets_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -53,4 +53,4 @@ public static void syncListAssets() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listassets_sync] +// [END cloudasset_v1_generated_AssetService_ListAssets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java index 15a6333d9b..bef9f5c125 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listassets_resourcename_sync] +// [START cloudasset_v1_generated_AssetService_ListAssets_Resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -61,4 +61,4 @@ public String toString() { } } } -// [END cloudasset_v1_generated_assetserviceclient_listassets_resourcename_sync] +// [END cloudasset_v1_generated_AssetService_ListAssets_Resourcename_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java index 12b46b6427..6c87901659 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listassets_string_sync] +// [START cloudasset_v1_generated_AssetService_ListAssets_String_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; @@ -41,4 +41,4 @@ public static void syncListAssetsString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listassets_string_sync] +// [END cloudasset_v1_generated_AssetService_ListAssets_String_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java index 9d3a8270d9..4207a2ba55 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listfeeds_async] +// [START cloudasset_v1_generated_AssetService_ListFeeds_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; @@ -44,4 +44,4 @@ public static void asyncListFeeds() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listfeeds_async] +// [END cloudasset_v1_generated_AssetService_ListFeeds_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java index 5fb1b06488..8f4c9daa94 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listfeeds_sync] +// [START cloudasset_v1_generated_AssetService_ListFeeds_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -40,4 +40,4 @@ public static void syncListFeeds() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listfeeds_sync] +// [END cloudasset_v1_generated_AssetService_ListFeeds_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java index 1d4549559e..3c94affab0 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_listfeeds_string_sync] +// [START cloudasset_v1_generated_AssetService_ListFeeds_String_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -38,4 +38,4 @@ public static void syncListFeedsString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_listfeeds_string_sync] +// [END cloudasset_v1_generated_AssetService_ListFeeds_String_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java index 8cba242783..12d0a7e183 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_async] +// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -54,4 +54,4 @@ public static void asyncSearchAllIamPolicies() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_async] +// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java index ee77539347..73e3439862 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] +// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_Paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -62,4 +62,4 @@ public static void asyncSearchAllIamPoliciesPaged() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] +// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_Paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java index 0268fc4940..76c9f0f56b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_sync] +// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -51,4 +51,4 @@ public static void syncSearchAllIamPolicies() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_sync] +// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java similarity index 90% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java index 6a8ba3ea40..61af31efa3 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] +// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_StringString_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -42,4 +42,4 @@ public static void syncSearchAllIamPoliciesStringString() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] +// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_StringString_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java index cc09e4e8dd..7fb2de5a48 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchallresources_async] +// [START cloudasset_v1_generated_AssetService_SearchAllResources_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; @@ -56,4 +56,4 @@ public static void asyncSearchAllResources() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchallresources_async] +// [END cloudasset_v1_generated_AssetService_SearchAllResources_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java index 01a66aa016..06586914a2 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchallresources_paged_async] +// [START cloudasset_v1_generated_AssetService_SearchAllResources_Paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -64,4 +64,4 @@ public static void asyncSearchAllResourcesPaged() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchallresources_paged_async] +// [END cloudasset_v1_generated_AssetService_SearchAllResources_Paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java index 32b67c09a6..5f8724fe34 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchallresources_sync] +// [START cloudasset_v1_generated_AssetService_SearchAllResources_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -53,4 +53,4 @@ public static void syncSearchAllResources() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_searchallresources_sync] +// [END cloudasset_v1_generated_AssetService_SearchAllResources_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java similarity index 90% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java index 8c207e88fe..b62bcc4348 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] +// [START cloudasset_v1_generated_AssetService_SearchAllResources_StringStringListstring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncSearchAllResourcesStringStringListstring() throws Excepti } } } -// [END cloudasset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] +// [END cloudasset_v1_generated_AssetService_SearchAllResources_StringStringListstring_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java index e5f5bad9f1..8a0a05656f 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_updatefeed_async] +// [START cloudasset_v1_generated_AssetService_UpdateFeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -47,4 +47,4 @@ public static void asyncUpdateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_updatefeed_async] +// [END cloudasset_v1_generated_AssetService_UpdateFeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java index c49e7302d5..b209292a95 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_updatefeed_sync] +// [START cloudasset_v1_generated_AssetService_UpdateFeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.UpdateFeedRequest; @@ -44,4 +44,4 @@ public static void syncUpdateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_updatefeed_sync] +// [END cloudasset_v1_generated_AssetService_UpdateFeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java index 930eaa2345..bdf9957e77 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetserviceclient_updatefeed_feed_sync] +// [START cloudasset_v1_generated_AssetService_UpdateFeed_Feed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncUpdateFeedFeed() throws Exception { } } } -// [END cloudasset_v1_generated_assetserviceclient_updatefeed_feed_sync] +// [END cloudasset_v1_generated_AssetService_UpdateFeed_Feed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 3d5d3c829b..02f4b3c771 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_assetservicesettings_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_AssetServiceSettings_BatchGetAssetsHistory_sync] import com.google.cloud.asset.v1.AssetServiceSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END cloudasset_v1_generated_assetservicesettings_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_AssetServiceSettings_BatchGetAssetsHistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 825f2fc417..31de0fc591 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.stub.samples; -// [START cloudasset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] +// [START cloudasset_v1_generated_AssetServiceStubSettings_BatchGetAssetsHistory_sync] import com.google.cloud.asset.v1.stub.AssetServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceStubSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END cloudasset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] +// [END cloudasset_v1_generated_AssetServiceStubSettings_BatchGetAssetsHistory_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java index c239cb97cc..5512d59424 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_async] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; @@ -56,4 +56,4 @@ public static void asyncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_async] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java index f091b9029c..6b77dd5c0d 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_sync] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_sync] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java index 7c13ec3e96..803d65bc7b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutation_sync] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutation_sync] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java index 546c08d12b..1280e1fa29 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutationstring_sync] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutationstring_sync] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java index 855a486e1c..5cf895095e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutation_sync] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowTablenameBytestringRowfilterListmutation } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutation_sync] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java index 10427749d1..9cdcf53a07 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutationstring_sync] +// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -53,4 +53,4 @@ public static void main(String[] args) throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutationstring_sync] +// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java index 98cefb28e7..f66938186f 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_create_setcredentialsprovider_sync] +// [START bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_basebigtabledataclient_create_setcredentialsprovider_sync] +// [END bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java index 508e397d2a..f6f57cfa51 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_create_setendpoint_sync] +// [START bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import com.google.cloud.bigtable.data.v2.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_basebigtabledataclient_create_setendpoint_sync] +// [END bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java index c0cbcf3237..50662848b6 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_async] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; @@ -53,4 +53,4 @@ public static void asyncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_async] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java index afe159a613..2a781526b9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_sync] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_sync] import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -49,4 +49,4 @@ public static void syncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_sync] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java index 11d1351a6e..cba00753a5 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutation_sync] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowStringBytestringListmutation() throws Exception } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutation_sync] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java index 5aec68b28f..cce51bae93 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutationstring_sync] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowStringBytestringListmutationString() throws Exce } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutationstring_sync] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java index 98649dea1b..ae4227348b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutation_sync] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowTablenameBytestringListmutation() throws Excepti } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutation_sync] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java index 2aadd5ed5e..2bc9e66996 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutationstring_sync] +// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowTablenameBytestringListmutationString() throws E } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutationstring_sync] +// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java index 06c1b8b139..ef7cc157a2 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_mutaterows_async] +// [START bigtable_v2_generated_BaseBigtableData_MutateRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.MutateRowsRequest; import com.google.bigtable.v2.MutateRowsResponse; @@ -51,4 +51,4 @@ public static void asyncMutateRows() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_mutaterows_async] +// [END bigtable_v2_generated_BaseBigtableData_MutateRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java index 25998e9002..961a96ee4a 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_async] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; @@ -53,4 +53,4 @@ public static void asyncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_async] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java index efc0c77519..1c79af443d 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_sync] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; @@ -49,4 +49,4 @@ public static void syncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_sync] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java index 9fe3f73534..05c6a3709c 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterule_sync] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterule_sync] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java index 37c5e6bf52..655f810290 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterulestring_sync] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterulestring_sync] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java index 1e89e38cc9..15f16dd17e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterule_sync] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterule_sync] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java index b276b946bd..5bfa5b796c 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterulestring_sync] +// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterulestring_sync] +// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java index 5132872889..745e7fbdc0 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_readrows_async] +// [START bigtable_v2_generated_BaseBigtableData_ReadRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.ReadRowsRequest; import com.google.bigtable.v2.ReadRowsResponse; @@ -54,4 +54,4 @@ public static void asyncReadRows() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_readrows_async] +// [END bigtable_v2_generated_BaseBigtableData_ReadRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java index a2e0468a45..bd252a0f6d 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledataclient_samplerowkeys_async] +// [START bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; @@ -49,4 +49,4 @@ public static void asyncSampleRowKeys() throws Exception { } } } -// [END bigtable_v2_generated_basebigtabledataclient_samplerowkeys_async] +// [END bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java index 216212eac8..9b3ac3557e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_basebigtabledatasettings_mutaterow_sync] +// [START bigtable_v2_generated_BaseBigtableDataSettings_MutateRow_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncMutateRow() throws Exception { BaseBigtableDataSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build(); } } -// [END bigtable_v2_generated_basebigtabledatasettings_mutaterow_sync] +// [END bigtable_v2_generated_BaseBigtableDataSettings_MutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java index be5058d4a5..3194f8487c 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.stub.samples; -// [START bigtable_v2_generated_bigtablestubsettings_mutaterow_sync] +// [START bigtable_v2_generated_BigtableStubSettings_MutateRow_sync] import com.google.cloud.bigtable.data.v2.stub.BigtableStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncMutateRow() throws Exception { BigtableStubSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build(); } } -// [END bigtable_v2_generated_bigtablestubsettings_mutaterow_sync] +// [END bigtable_v2_generated_BigtableStubSettings_MutateRow_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java index 2c48e6113d..fd623a44bf 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_aggregatedlist_async] +// [START compute_v1small_generated_Addresses_AggregatedList_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; @@ -54,4 +54,4 @@ public static void asyncAggregatedList() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_aggregatedlist_async] +// [END compute_v1small_generated_Addresses_AggregatedList_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java index cc8ac49447..333c757c68 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_aggregatedlist_paged_async] +// [START compute_v1small_generated_Addresses_AggregatedList_Paged_async] import com.google.cloud.compute.v1small.AddressAggregatedList; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; @@ -61,4 +61,4 @@ public static void asyncAggregatedListPaged() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_aggregatedlist_paged_async] +// [END compute_v1small_generated_Addresses_AggregatedList_Paged_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java index 64c49a659c..21afc1d2c0 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_aggregatedlist_sync] +// [START compute_v1small_generated_Addresses_AggregatedList_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; import com.google.cloud.compute.v1small.AggregatedListAddressesRequest; @@ -51,4 +51,4 @@ public static void syncAggregatedList() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_aggregatedlist_sync] +// [END compute_v1small_generated_Addresses_AggregatedList_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java index 8584dc2601..0320dc1970 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_aggregatedlist_string_sync] +// [START compute_v1small_generated_Addresses_AggregatedList_String_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; import java.util.Map; @@ -42,4 +42,4 @@ public static void syncAggregatedListString() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_aggregatedlist_string_sync] +// [END compute_v1small_generated_Addresses_AggregatedList_String_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java index ba36dc70c4..ee626b3833 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_create_setcredentialsprovider_sync] +// [START compute_v1small_generated_Addresses_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { AddressesClient addressesClient = AddressesClient.create(addressesSettings); } } -// [END compute_v1small_generated_addressesclient_create_setcredentialsprovider_sync] +// [END compute_v1small_generated_Addresses_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java index 8176f67fda..49a9b34bf3 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_create_setendpoint_sync] +// [START compute_v1small_generated_Addresses_Create_SetEndpoint_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesSettings; import com.google.cloud.compute.v1small.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { AddressesClient addressesClient = AddressesClient.create(addressesSettings); } } -// [END compute_v1small_generated_addressesclient_create_setendpoint_sync] +// [END compute_v1small_generated_Addresses_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java index 1beebc8372..53a63b72eb 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_delete_async] +// [START compute_v1small_generated_Addresses_Delete_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; @@ -48,4 +48,4 @@ public static void asyncDelete() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_delete_async] +// [END compute_v1small_generated_Addresses_Delete_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java index ce650ce314..86c2dc5992 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_delete_lro_async] +// [START compute_v1small_generated_Addresses_Delete_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteLRO() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_delete_lro_async] +// [END compute_v1small_generated_Addresses_Delete_LRO_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java index ca1be3321b..8cc976a9a1 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_delete_sync] +// [START compute_v1small_generated_Addresses_Delete_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; import com.google.cloud.compute.v1small.Operation; @@ -45,4 +45,4 @@ public static void syncDelete() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_delete_sync] +// [END compute_v1small_generated_Addresses_Delete_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java index 85e0501168..d9152c6c41 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_delete_stringstringstring_sync] +// [START compute_v1small_generated_Addresses_Delete_StringStringString_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.Operation; @@ -40,4 +40,4 @@ public static void syncDeleteStringStringString() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_delete_stringstringstring_sync] +// [END compute_v1small_generated_Addresses_Delete_StringStringString_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java index be58773685..c4004a223d 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_insert_async] +// [START compute_v1small_generated_Addresses_Insert_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -49,4 +49,4 @@ public static void asyncInsert() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_insert_async] +// [END compute_v1small_generated_Addresses_Insert_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java index 502fe4c8e2..4e70ce04b1 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_insert_lro_async] +// [START compute_v1small_generated_Addresses_Insert_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -50,4 +50,4 @@ public static void asyncInsertLRO() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_insert_lro_async] +// [END compute_v1small_generated_Addresses_Insert_LRO_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java index 494a59828e..3c38ab50fb 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_insert_sync] +// [START compute_v1small_generated_Addresses_Insert_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.InsertAddressRequest; @@ -46,4 +46,4 @@ public static void syncInsert() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_insert_sync] +// [END compute_v1small_generated_Addresses_Insert_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java index 1e9683a4d1..3f6d001f75 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_insert_stringstringaddress_sync] +// [START compute_v1small_generated_Addresses_Insert_StringStringAddress_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.Operation; @@ -41,4 +41,4 @@ public static void syncInsertStringStringAddress() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_insert_stringstringaddress_sync] +// [END compute_v1small_generated_Addresses_Insert_StringStringAddress_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java index af52a45ec7..89088a5a04 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_list_async] +// [START compute_v1small_generated_Addresses_List_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -52,4 +52,4 @@ public static void asyncList() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_list_async] +// [END compute_v1small_generated_Addresses_List_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java index 660ec082b8..e749bc7595 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_list_paged_async] +// [START compute_v1small_generated_Addresses_List_Paged_async] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressList; import com.google.cloud.compute.v1small.AddressesClient; @@ -60,4 +60,4 @@ public static void asyncListPaged() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_list_paged_async] +// [END compute_v1small_generated_Addresses_List_Paged_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java index 6b7f31ada7..3c105181a7 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_list_sync] +// [START compute_v1small_generated_Addresses_List_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.ListAddressesRequest; @@ -49,4 +49,4 @@ public static void syncList() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_list_sync] +// [END compute_v1small_generated_Addresses_List_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java index ee547f1107..bc47d773c9 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressesclient_list_stringstringstring_sync] +// [START compute_v1small_generated_Addresses_List_StringStringString_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -42,4 +42,4 @@ public static void syncListStringStringString() throws Exception { } } } -// [END compute_v1small_generated_addressesclient_list_stringstringstring_sync] +// [END compute_v1small_generated_Addresses_List_StringStringString_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java index d2b76886b0..fa405f919b 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_addressessettings_aggregatedlist_sync] +// [START compute_v1small_generated_AddressesSettings_AggregatedList_sync] import com.google.cloud.compute.v1small.AddressesSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncAggregatedList() throws Exception { AddressesSettings addressesSettings = addressesSettingsBuilder.build(); } } -// [END compute_v1small_generated_addressessettings_aggregatedlist_sync] +// [END compute_v1small_generated_AddressesSettings_AggregatedList_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java index 9a7c59a44a..2768ddd357 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_create_setcredentialsprovider_sync] +// [START compute_v1small_generated_RegionOperations_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.RegionOperationsSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { RegionOperationsClient.create(regionOperationsSettings); } } -// [END compute_v1small_generated_regionoperationsclient_create_setcredentialsprovider_sync] +// [END compute_v1small_generated_RegionOperations_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java index 98f3320db3..d8bbb778d7 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_create_setendpoint_sync] +// [START compute_v1small_generated_RegionOperations_Create_SetEndpoint_sync] import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.RegionOperationsSettings; import com.google.cloud.compute.v1small.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { RegionOperationsClient.create(regionOperationsSettings); } } -// [END compute_v1small_generated_regionoperationsclient_create_setendpoint_sync] +// [END compute_v1small_generated_RegionOperations_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java index ae4ba65890..ab424fc0c1 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_get_async] +// [START compute_v1small_generated_RegionOperations_Get_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.GetRegionOperationRequest; import com.google.cloud.compute.v1small.Operation; @@ -47,4 +47,4 @@ public static void asyncGet() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_get_async] +// [END compute_v1small_generated_RegionOperations_Get_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java index caaa2ce9ec..59138ed2e8 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_get_sync] +// [START compute_v1small_generated_RegionOperations_Get_sync] import com.google.cloud.compute.v1small.GetRegionOperationRequest; import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -44,4 +44,4 @@ public static void syncGet() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_get_sync] +// [END compute_v1small_generated_RegionOperations_Get_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java index 64eb451264..00ebf2a01e 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_get_stringstringstring_sync] +// [START compute_v1small_generated_RegionOperations_Get_StringStringString_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -40,4 +40,4 @@ public static void syncGetStringStringString() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_get_stringstringstring_sync] +// [END compute_v1small_generated_RegionOperations_Get_StringStringString_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java index 52ae3a1ff1..f02fcb2fad 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_wait_async] +// [START compute_v1small_generated_RegionOperations_Wait_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -47,4 +47,4 @@ public static void asyncWait() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_wait_async] +// [END compute_v1small_generated_RegionOperations_Wait_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java similarity index 92% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java index 8b1947a19a..41c9b22574 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_wait_sync] +// [START compute_v1small_generated_RegionOperations_Wait_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.WaitRegionOperationRequest; @@ -44,4 +44,4 @@ public static void syncWait() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_wait_sync] +// [END compute_v1small_generated_RegionOperations_Wait_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java index da7031e67a..791fdfe170 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationsclient_wait_stringstringstring_sync] +// [START compute_v1small_generated_RegionOperations_Wait_StringStringString_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -40,4 +40,4 @@ public static void syncWaitStringStringString() throws Exception { } } } -// [END compute_v1small_generated_regionoperationsclient_wait_stringstringstring_sync] +// [END compute_v1small_generated_RegionOperations_Wait_StringStringString_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java index e599705557..87bb6ca330 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_regionoperationssettings_get_sync] +// [START compute_v1small_generated_RegionOperationsSettings_Get_sync] import com.google.cloud.compute.v1small.RegionOperationsSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGet() throws Exception { RegionOperationsSettings regionOperationsSettings = regionOperationsSettingsBuilder.build(); } } -// [END compute_v1small_generated_regionoperationssettings_get_sync] +// [END compute_v1small_generated_RegionOperationsSettings_Get_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java index 32a9994c46..4d7ea1ee76 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.stub.samples; -// [START compute_v1small_generated_addressesstubsettings_aggregatedlist_sync] +// [START compute_v1small_generated_AddressesStubSettings_AggregatedList_sync] import com.google.cloud.compute.v1small.stub.AddressesStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncAggregatedList() throws Exception { AddressesStubSettings addressesSettings = addressesSettingsBuilder.build(); } } -// [END compute_v1small_generated_addressesstubsettings_aggregatedlist_sync] +// [END compute_v1small_generated_AddressesStubSettings_AggregatedList_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java index 956110de2e..4e2e67f189 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.stub.samples; -// [START compute_v1small_generated_regionoperationsstubsettings_get_sync] +// [START compute_v1small_generated_RegionOperationsStubSettings_Get_sync] import com.google.cloud.compute.v1small.stub.RegionOperationsStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGet() throws Exception { RegionOperationsStubSettings regionOperationsSettings = regionOperationsSettingsBuilder.build(); } } -// [END compute_v1small_generated_regionoperationsstubsettings_get_sync] +// [END compute_v1small_generated_RegionOperationsStubSettings_Get_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java index db4fcb3cea..3146b16b81 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] +// [START iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] +// [END iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java index c9044fbb8b..facddbfac4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] +// [START iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import com.google.cloud.iam.credentials.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] +// [END iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java index 82fec39f81..dee5a52a87 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] +// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; @@ -52,4 +52,4 @@ public static void asyncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] +// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java similarity index 92% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java index 4cf48ad7f3..b4ebf01b22 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -48,4 +48,4 @@ public static void syncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java index e93168fe15..ccdd12da60 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -47,4 +47,4 @@ public static void syncGenerateAccessTokenServiceaccountnameListstringListstring } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java index bfcdbec493..0cf10fcd52 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateAccessTokenStringListstringListstringDuration() t } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java index f670fc541c..f4191b5b76 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_async] +// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; @@ -51,4 +51,4 @@ public static void asyncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_async] +// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java similarity index 92% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java index 8828bf341c..8de72543a3 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -47,4 +47,4 @@ public static void syncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java index f4b403409a..c0580eb919 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateIdTokenServiceaccountnameListstringStringBoolean( } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java index 5627745068..7ce5cb46a5 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] +// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -45,4 +45,4 @@ public static void syncGenerateIdTokenStringListstringStringBoolean() throws Exc } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] +// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java index 338c3112e0..52b0a779e4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_async] +// [START iamcredentials_v1_generated_IamCredentials_SignBlob_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -51,4 +51,4 @@ public static void asyncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_async] +// [END iamcredentials_v1_generated_IamCredentials_SignBlob_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java index da2fa84ba8..8a53f4257a 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignBlob_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobRequest; @@ -47,4 +47,4 @@ public static void syncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignBlob_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java index 12ad8f05d7..5d7fa16f03 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobServiceaccountnameListstringBytestring() throws E } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java index 8e1906d162..d5fbb9b84e 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobStringListstringBytestring() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java index e788c93cee..4fa410b6bc 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_async] +// [START iamcredentials_v1_generated_IamCredentials_SignJwt_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -50,4 +50,4 @@ public static void asyncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_async] +// [END iamcredentials_v1_generated_IamCredentials_SignJwt_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java index 82b687d781..0ccf396ecf 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignJwt_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtRequest; @@ -46,4 +46,4 @@ public static void syncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignJwt_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java index b0bfa2c1be..644b820f85 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtServiceaccountnameListstringString() throws Except } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java index fdb2a5080e..a6e6e0426a 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] +// [START iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtStringListstringString() throws Exception { } } } -// [END iamcredentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] +// [END iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java index 9de6e9526c..2e6a9be158 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_IamCredentialsSettings_GenerateAccessToken_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END iamcredentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_IamCredentialsSettings_GenerateAccessToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java index 9668a2229f..f23179fcee 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.stub.samples; -// [START iamcredentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] +// [START iamcredentials_v1_generated_IamCredentialsStubSettings_GenerateAccessToken_sync] import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsStubSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END iamcredentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] +// [END iamcredentials_v1_generated_IamCredentialsStubSettings_GenerateAccessToken_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java index 4cd74600b9..5b8e4b2079 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_create_setcredentialsprovider_sync] +// [START iam_v1_generated_IAMPolicy_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.IAMPolicySettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IAMPolicyClient iAMPolicyClient = IAMPolicyClient.create(iAMPolicySettings); } } -// [END iam_v1_generated_iampolicyclient_create_setcredentialsprovider_sync] +// [END iam_v1_generated_IAMPolicy_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java index 16fdc64355..fe71ec9934 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_create_setendpoint_sync] +// [START iam_v1_generated_IAMPolicy_Create_SetEndpoint_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.IAMPolicySettings; import com.google.iam.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IAMPolicyClient iAMPolicyClient = IAMPolicyClient.create(iAMPolicySettings); } } -// [END iam_v1_generated_iampolicyclient_create_setendpoint_sync] +// [END iam_v1_generated_IAMPolicy_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java index 441d834597..768a0bde7c 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_getiampolicy_async] +// [START iam_v1_generated_IAMPolicy_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -47,4 +47,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_getiampolicy_async] +// [END iam_v1_generated_IAMPolicy_GetIamPolicy_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java index ac82d3739c..6a2c286638 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_getiampolicy_sync] +// [START iam_v1_generated_IAMPolicy_GetIamPolicy_sync] import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; import com.google.iam.v1.IAMPolicyClient; @@ -44,4 +44,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_getiampolicy_sync] +// [END iam_v1_generated_IAMPolicy_GetIamPolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java index 2aea2886b9..fdcde733d3 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_setiampolicy_async] +// [START iam_v1_generated_IAMPolicy_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.Policy; @@ -46,4 +46,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_setiampolicy_async] +// [END iam_v1_generated_IAMPolicy_SetIamPolicy_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java index 9e01e5cf1f..55d362db48 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_setiampolicy_sync] +// [START iam_v1_generated_IAMPolicy_SetIamPolicy_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -43,4 +43,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_setiampolicy_sync] +// [END iam_v1_generated_IAMPolicy_SetIamPolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java index 4e7920f9cc..ebaa1ba351 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_testiampermissions_async] +// [START iam_v1_generated_IAMPolicy_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -48,4 +48,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_testiampermissions_async] +// [END iam_v1_generated_IAMPolicy_TestIamPermissions_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java index 241d958b43..70921f8b0f 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_testiampermissions_sync] +// [START iam_v1_generated_IAMPolicy_TestIamPermissions_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -44,4 +44,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END iam_v1_generated_iampolicyclient_testiampermissions_sync] +// [END iam_v1_generated_IAMPolicy_TestIamPermissions_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java index 07c44e3f36..f97670d70b 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicysettings_setiampolicy_sync] +// [START iam_v1_generated_IAMPolicySettings_SetIamPolicy_sync] import com.google.iam.v1.IAMPolicySettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncSetIamPolicy() throws Exception { IAMPolicySettings iAMPolicySettings = iAMPolicySettingsBuilder.build(); } } -// [END iam_v1_generated_iampolicysettings_setiampolicy_sync] +// [END iam_v1_generated_IAMPolicySettings_SetIamPolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java index 5dcf9940db..326c24a6dc 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.stub.samples; -// [START iam_v1_generated_iampolicystubsettings_setiampolicy_sync] +// [START iam_v1_generated_IAMPolicyStubSettings_SetIamPolicy_sync] import com.google.iam.v1.stub.IAMPolicyStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncSetIamPolicy() throws Exception { IAMPolicyStubSettings iAMPolicySettings = iAMPolicySettingsBuilder.build(); } } -// [END iam_v1_generated_iampolicystubsettings_setiampolicy_sync] +// [END iam_v1_generated_IAMPolicyStubSettings_SetIamPolicy_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java index 12bc233abe..2768ea0ab8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java index a30ce59b2f..13ee008da3 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_sync] import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java index 17d42368d0..402cbd4ecb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_CryptokeyversionnameBytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -45,4 +45,4 @@ public static void syncAsymmetricDecryptCryptokeyversionnameBytestring() throws } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_CryptokeyversionnameBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java index 83b946207e..2e7e021dce 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_StringBytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncAsymmetricDecryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_StringBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java index caa1473dde..458da95d07 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_async] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricSign() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_async] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java index d16356d4b9..6d38dccafe 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_sync] import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricSign() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java index 37dca40018..2f3802533a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_CryptokeyversionnameDigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -44,4 +44,4 @@ public static void syncAsymmetricSignCryptokeyversionnameDigest() throws Excepti } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_CryptokeyversionnameDigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java index 693e9bfc5e..905a71eb32 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] +// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_StringDigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -45,4 +45,4 @@ public static void syncAsymmetricSignStringDigest() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] +// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_StringDigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java index 9e76f9250c..c96d3a6bdf 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] +// [START cloudkms_v1_generated_KeyManagementService_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END cloudkms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] +// [END cloudkms_v1_generated_KeyManagementService_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java index a47ef9da7c..deb933fa8a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] +// [START cloudkms_v1_generated_KeyManagementService_Create_SetEndpoint_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; import com.google.cloud.kms.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END cloudkms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] +// [END cloudkms_v1_generated_KeyManagementService_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java index 509ec9c1aa..4ffbf58a50 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_async] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_async] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java index 4626d271e1..ea9b536553 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_sync] import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java index d40e15a269..d8cec59da0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_KeyringnameStringCryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyKeyringnameStringCryptokey() throws Except } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_KeyringnameStringCryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java index 3b1616c1e9..ba7eda7d35 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_StringStringCryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyStringStringCryptokey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_StringStringCryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java index 0595997ae5..e4fe7cef5c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java index 8b4f543898..3d5b68f74a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java index 8ccdcf86b3..6fa204a3da 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_CryptokeynameCryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionCryptokeynameCryptokeyversion() thr } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_CryptokeynameCryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java index 338d57775e..5a64f18b00 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_StringCryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionStringCryptokeyversion() throws Exc } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_StringCryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java index b557f641f9..458b666b2a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_async] +// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncCreateImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_async] +// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java index 1a1066d560..10ac1fe7ee 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_sync] import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncCreateImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java index 8fe9146ac7..e25252b6a0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_KeyringnameStringImportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobKeyringnameStringImportjob() throws Except } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_KeyringnameStringImportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java index 9d8031894f..69d497e017 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_StringStringImportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobStringStringImportjob() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_StringStringImportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java index a0c7c2dd6e..d39ca8f888 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_async] +// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -50,4 +50,4 @@ public static void asyncCreateKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_async] +// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java index be6e331a4d..c58aa6961a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_sync] import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -46,4 +46,4 @@ public static void syncCreateKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java index 907f57aa3d..46add0d8c9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_LocationnameStringKeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingLocationnameStringKeyring() throws Exception } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_LocationnameStringKeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java index 3ae2929909..067e82288a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_StringStringKeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingStringStringKeyring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_StringStringKeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java index 20e0506c55..6a32d6f8e1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_async] +// [START cloudkms_v1_generated_KeyManagementService_Decrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; @@ -56,4 +56,4 @@ public static void asyncDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_async] +// [END cloudkms_v1_generated_KeyManagementService_Decrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java index 733948ab43..dac8b2ca95 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_sync] +// [START cloudkms_v1_generated_KeyManagementService_Decrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; import com.google.cloud.kms.v1.DecryptResponse; @@ -52,4 +52,4 @@ public static void syncDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_sync] +// [END cloudkms_v1_generated_KeyManagementService_Decrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java index 9d0f93de64..a2980791bd 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_Decrypt_CryptokeynameBytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptCryptokeynameBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_Decrypt_CryptokeynameBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java index 0e9ebecd78..b94582483c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_Decrypt_StringBytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_Decrypt_StringBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java index 6e35f41857..8a42b375c3 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncDestroyCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java index 00484ded76..c2bb7e68d4 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncDestroyCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java index 4089e10ef0..560f768080 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_Cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncDestroyCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_Cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java index b8d997f9d6..60880a6a3a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_String_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDestroyCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java index 77aa9a7a32..b31c045a11 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_async] +// [START cloudkms_v1_generated_KeyManagementService_Encrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; @@ -56,4 +56,4 @@ public static void asyncEncrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_async] +// [END cloudkms_v1_generated_KeyManagementService_Encrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java index 1d6f5928f5..0c8fe72c44 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_sync] +// [START cloudkms_v1_generated_KeyManagementService_Encrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; import com.google.cloud.kms.v1.EncryptResponse; @@ -52,4 +52,4 @@ public static void syncEncrypt() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_sync] +// [END cloudkms_v1_generated_KeyManagementService_Encrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java index 79d3932c9d..1b332fefc8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_Encrypt_ResourcenameBytestring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; @@ -43,4 +43,4 @@ public static void syncEncryptResourcenameBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_Encrypt_ResourcenameBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java index cec9cf2333..07762a2140 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_Encrypt_StringBytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncEncryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_Encrypt_StringBytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java index f777d40c39..0a317395bc 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_async] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -50,4 +50,4 @@ public static void asyncGetCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_async] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java index 2ec60f1295..5bc4d96d8a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.GetCryptoKeyRequest; @@ -46,4 +46,4 @@ public static void syncGetCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java index d049f653a2..9c07a8a3f9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_Cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyCryptokeyname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_Cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java index 88f08857ee..9216849d6b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_String_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java index 97d8ab731c..bdc547e7bf 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncGetCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java index 4977fc91a1..22ce91d55e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncGetCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java index 2310db9ebb..73aa2d577a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_Cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncGetCryptoKeyVersionCryptokeyversionname() throws Exceptio } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_Cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java index 08c7728683..67abf494d5 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_String_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncGetCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java index 401096168c..93eb30dac0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_async] +// [START cloudkms_v1_generated_KeyManagementService_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_async] +// [END cloudkms_v1_generated_KeyManagementService_GetIamPolicy_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java index c27aff6602..5e0bfa23da 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetIamPolicy_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getiampolicy_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetIamPolicy_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java index ef11db67a0..bcad674dc7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_async] +// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncGetImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_async] +// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java index 47cb997d54..7cd02a81ea 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_sync] import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; @@ -46,4 +46,4 @@ public static void syncGetImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java index 04cd565d8f..ec16718779 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_Importjobname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobImportjobname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_Importjobname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java index 134f1f7981..ad8655ede8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_String_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java index 24cce5e9be..59a16e8740 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_async] +// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -48,4 +48,4 @@ public static void asyncGetKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_async] +// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java index 03f7a908ec..a880293179 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_sync] import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -44,4 +44,4 @@ public static void syncGetKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java index 5a91330c62..5353772a9f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_Keyringname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_Keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java index 9e86f8e39f..b6305c4ce7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_String_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java index b2b1b8a18f..b496695cc2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getlocation_async] +// [START cloudkms_v1_generated_KeyManagementService_GetLocation_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; @@ -44,4 +44,4 @@ public static void asyncGetLocation() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getlocation_async] +// [END cloudkms_v1_generated_KeyManagementService_GetLocation_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java index c26d5c7d30..5972b43835 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getlocation_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetLocation_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; import com.google.cloud.location.Location; @@ -40,4 +40,4 @@ public static void syncGetLocation() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getlocation_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetLocation_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java index 5f779b2f9b..1ba333176d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_async] +// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; @@ -55,4 +55,4 @@ public static void asyncGetPublicKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_async] +// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java index 7a5412ce50..cd3d9e3e13 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncGetPublicKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java index b83c6ef0d3..933f9681ab 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_Cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -42,4 +42,4 @@ public static void syncGetPublicKeyCryptokeyversionname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_Cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java index 21ef9ac23c..371d27f697 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_String_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -43,4 +43,4 @@ public static void syncGetPublicKeyString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java index e8af8616fc..7325f636c0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -51,4 +51,4 @@ public static void asyncImportCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java index b1e7a2e675..e6c5a63a11 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.ImportCryptoKeyVersionRequest; @@ -47,4 +47,4 @@ public static void syncImportCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java index 9d57500ce0..6d8d539696 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_async] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListCryptoKeys() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_async] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java index 78e51a0786..06b5ceb184 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Paged_async] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListCryptoKeysPaged() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java index 425054f5a6..1d4cacf80e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListCryptoKeys() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java index d717447b4f..9f24627011 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Keyringname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java index e724974a82..b32726dab8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_String_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java index 08ca16b7ed..59182b4b2d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -56,4 +56,4 @@ public static void asyncListCryptoKeyVersions() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java index 874c92f919..ac7a2dd8a4 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Paged_async] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -64,4 +64,4 @@ public static void asyncListCryptoKeyVersionsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java index f06def473d..68a38385ca 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -53,4 +53,4 @@ public static void syncListCryptoKeyVersions() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java index 98f65347de..0941b5c4d7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsCryptokeyname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java index 86d2d44eed..6cd8fc6850 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_String_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java index d9cad3d111..192e034b1e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_async] +// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListImportJobs() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_async] +// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java index 5860192ae2..59b6b51662 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] +// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_Paged_async] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListImportJobsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] +// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_Paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java index 8d332bb928..dfd76a428b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListImportJobs() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java index dda6bdac38..4500177df1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_Keyringname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_Keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java index a0c62ce5be..66d5957f30 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_String_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java index e368d4e74c..83d8701f1a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_async] +// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -54,4 +54,4 @@ public static void asyncListKeyRings() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_async] +// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java index 0f1699844e..381b2c92a0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] +// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_Paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -62,4 +62,4 @@ public static void asyncListKeyRingsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] +// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_Paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java index 8a47b96eb6..732646f6e8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -50,4 +50,4 @@ public static void syncListKeyRings() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java index bf0004166d..9a75758574 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_Locationname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsLocationname() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_Locationname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java index a1bc04535e..49ab833c61 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_String_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java index 2c93eac415..7719410624 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_async] +// [START cloudkms_v1_generated_KeyManagementService_ListLocations_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; @@ -52,4 +52,4 @@ public static void asyncListLocations() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_async] +// [END cloudkms_v1_generated_KeyManagementService_ListLocations_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java index 855e186729..c5ac23eeb3 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_paged_async] +// [START cloudkms_v1_generated_KeyManagementService_ListLocations_Paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.ListLocationsResponse; @@ -60,4 +60,4 @@ public static void asyncListLocationsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_paged_async] +// [END cloudkms_v1_generated_KeyManagementService_ListLocations_Paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java index 1ea5a3db8a..c377381038 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_listlocations_sync] +// [START cloudkms_v1_generated_KeyManagementService_ListLocations_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.Location; @@ -48,4 +48,4 @@ public static void syncListLocations() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_listlocations_sync] +// [END cloudkms_v1_generated_KeyManagementService_ListLocations_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java index 715493b98b..1bad87972d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncRestoreCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java index a3de0c99b8..68b6ed6531 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncRestoreCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java index 4c9cde5031..986539cc01 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] +// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_Cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncRestoreCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] +// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_Cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java index 876353526f..fc372ed700 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] +// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_String_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncRestoreCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] +// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_String_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java index 3597e58f5a..ac5a891597 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_async] +// [START cloudkms_v1_generated_KeyManagementService_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_async] +// [END cloudkms_v1_generated_KeyManagementService_TestIamPermissions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java index e33b06bb8b..2394e3686b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_sync] +// [START cloudkms_v1_generated_KeyManagementService_TestIamPermissions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -48,4 +48,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_testiampermissions_sync] +// [END cloudkms_v1_generated_KeyManagementService_TestIamPermissions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java index 832a0e648f..3c70757f69 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_async] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_async] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java index 86c9549eb2..19f8b75878 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java index 980affb15b..b61deebb66 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_CryptokeyFieldmask_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -41,4 +41,4 @@ public static void syncUpdateCryptoKeyCryptokeyFieldmask() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_CryptokeyFieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java index 011d28534f..5d1306e7f6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java index 9d10d6f50e..91c10be799 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java index 09f41244ee..302e5fa67b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_CryptokeynameString_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionCryptokeynameString() throws } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_CryptokeynameString_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java index a9b17f02d8..377b15c87f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_StringString_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionStringString() throws Except } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_StringString_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java index 07666ee3ed..801687a7a6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java index f91fa9f0bd..20825bbf94 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java index 7730719384..3b54c8b97f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] +// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_CryptokeyversionFieldmask_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -42,4 +42,4 @@ public static void syncUpdateCryptoKeyVersionCryptokeyversionFieldmask() throws } } } -// [END cloudkms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] +// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_CryptokeyversionFieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java index c2bfa0f01c..3a20509fde 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_keymanagementservicesettings_getkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementServiceSettings_GetKeyRing_sync] import com.google.cloud.kms.v1.KeyManagementServiceSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END cloudkms_v1_generated_keymanagementservicesettings_getkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementServiceSettings_GetKeyRing_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java index a41ec9fa58..75547f5f7a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.stub.samples; -// [START cloudkms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] +// [START cloudkms_v1_generated_KeyManagementServiceStubSettings_GetKeyRing_sync] import com.google.cloud.kms.v1.stub.KeyManagementServiceStubSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END cloudkms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] +// [END cloudkms_v1_generated_KeyManagementServiceStubSettings_GetKeyRing_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java index b6f6a12b95..0a449701a1 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] +// [START example_v1_generated_LibraryService_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END example_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] +// [END example_v1_generated_LibraryService_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java index 2e9674debb..1ed4230d03 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_create_setendpoint_sync] +// [START example_v1_generated_LibraryService_Create_SetEndpoint_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; import com.google.cloud.example.library.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END example_v1_generated_libraryserviceclient_create_setendpoint_sync] +// [END example_v1_generated_LibraryService_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java index 5dbe9ea3a8..d58d7c2ca5 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createbook_async] +// [START example_v1_generated_LibraryService_CreateBook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncCreateBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createbook_async] +// [END example_v1_generated_LibraryService_CreateBook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java index b593ac0f36..206c7673f5 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createbook_sync] +// [START example_v1_generated_LibraryService_CreateBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.CreateBookRequest; @@ -44,4 +44,4 @@ public static void syncCreateBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createbook_sync] +// [END example_v1_generated_LibraryService_CreateBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java index 4155f046ee..5cd834c754 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] +// [START example_v1_generated_LibraryService_CreateBook_ShelfnameBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookShelfnameBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] +// [END example_v1_generated_LibraryService_CreateBook_ShelfnameBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java index 6bc2eb732a..97a22b457a 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createbook_stringbook_sync] +// [START example_v1_generated_LibraryService_CreateBook_StringBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookStringBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createbook_stringbook_sync] +// [END example_v1_generated_LibraryService_CreateBook_StringBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java index 1a3e4e0cb8..a6707d3f05 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createshelf_async] +// [START example_v1_generated_LibraryService_CreateShelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; @@ -43,4 +43,4 @@ public static void asyncCreateShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createshelf_async] +// [END example_v1_generated_LibraryService_CreateShelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java index 7cc61a07b8..b1017b8894 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createshelf_sync] +// [START example_v1_generated_LibraryService_CreateShelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; import com.google.example.library.v1.Shelf; @@ -40,4 +40,4 @@ public static void syncCreateShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createshelf_sync] +// [END example_v1_generated_LibraryService_CreateShelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java index 067c90e13d..d594994378 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_createshelf_shelf_sync] +// [START example_v1_generated_LibraryService_CreateShelf_Shelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; @@ -38,4 +38,4 @@ public static void syncCreateShelfShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_createshelf_shelf_sync] +// [END example_v1_generated_LibraryService_CreateShelf_Shelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java index 3388ada78d..1402bdeb2b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deletebook_async] +// [START example_v1_generated_LibraryService_DeleteBook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; @@ -46,4 +46,4 @@ public static void asyncDeleteBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deletebook_async] +// [END example_v1_generated_LibraryService_DeleteBook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java index 4ef50221de..ce5f72f7d4 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deletebook_sync] +// [START example_v1_generated_LibraryService_DeleteBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.example.library.v1.DeleteBookRequest; @@ -43,4 +43,4 @@ public static void syncDeleteBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deletebook_sync] +// [END example_v1_generated_LibraryService_DeleteBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java index 0ebe865a59..4984014875 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deletebook_bookname_sync] +// [START example_v1_generated_LibraryService_DeleteBook_Bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookBookname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deletebook_bookname_sync] +// [END example_v1_generated_LibraryService_DeleteBook_Bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java index 369ae353d3..2747919b8c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deletebook_string_sync] +// [START example_v1_generated_LibraryService_DeleteBook_String_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deletebook_string_sync] +// [END example_v1_generated_LibraryService_DeleteBook_String_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java index c1e9375ce3..00960baafe 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deleteshelf_async] +// [START example_v1_generated_LibraryService_DeleteShelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; @@ -44,4 +44,4 @@ public static void asyncDeleteShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deleteshelf_async] +// [END example_v1_generated_LibraryService_DeleteShelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java index 2322037305..737844b638 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deleteshelf_sync] +// [START example_v1_generated_LibraryService_DeleteShelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncDeleteShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deleteshelf_sync] +// [END example_v1_generated_LibraryService_DeleteShelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java index 7de331b361..5b9a49da88 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] +// [START example_v1_generated_LibraryService_DeleteShelf_Shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] +// [END example_v1_generated_LibraryService_DeleteShelf_Shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java index 8a32bb7d78..6a1bc22c88 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_deleteshelf_string_sync] +// [START example_v1_generated_LibraryService_DeleteShelf_String_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_deleteshelf_string_sync] +// [END example_v1_generated_LibraryService_DeleteShelf_String_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java index b819462eb0..19f18d0b29 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getbook_async] +// [START example_v1_generated_LibraryService_GetBook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -44,4 +44,4 @@ public static void asyncGetBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getbook_async] +// [END example_v1_generated_LibraryService_GetBook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java index 6c4569ecdb..31858147ef 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getbook_sync] +// [START example_v1_generated_LibraryService_GetBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncGetBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getbook_sync] +// [END example_v1_generated_LibraryService_GetBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java index d7029a08a2..718395228e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getbook_bookname_sync] +// [START example_v1_generated_LibraryService_GetBook_Bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookBookname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getbook_bookname_sync] +// [END example_v1_generated_LibraryService_GetBook_Bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java index a36359a425..5c7f398a5e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getbook_string_sync] +// [START example_v1_generated_LibraryService_GetBook_String_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getbook_string_sync] +// [END example_v1_generated_LibraryService_GetBook_String_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java index e759952106..0d7d770f7c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getshelf_async] +// [START example_v1_generated_LibraryService_GetShelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; @@ -44,4 +44,4 @@ public static void asyncGetShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getshelf_async] +// [END example_v1_generated_LibraryService_GetShelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java index 719c5e6354..b6ddbfd368 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getshelf_sync] +// [START example_v1_generated_LibraryService_GetShelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; import com.google.example.library.v1.Shelf; @@ -41,4 +41,4 @@ public static void syncGetShelf() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getshelf_sync] +// [END example_v1_generated_LibraryService_GetShelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java index a819099ef3..7d6955a5f7 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getshelf_shelfname_sync] +// [START example_v1_generated_LibraryService_GetShelf_Shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getshelf_shelfname_sync] +// [END example_v1_generated_LibraryService_GetShelf_Shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java index e2a693d78d..9f4e413306 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_getshelf_string_sync] +// [START example_v1_generated_LibraryService_GetShelf_String_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_getshelf_string_sync] +// [END example_v1_generated_LibraryService_GetShelf_String_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java index 6b790d499c..b5b4237d8b 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listbooks_async] +// [START example_v1_generated_LibraryService_ListBooks_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -50,4 +50,4 @@ public static void asyncListBooks() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listbooks_async] +// [END example_v1_generated_LibraryService_ListBooks_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java similarity index 94% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java index dedb1f397f..243f5c6525 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listbooks_paged_async] +// [START example_v1_generated_LibraryService_ListBooks_Paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.Book; @@ -58,4 +58,4 @@ public static void asyncListBooksPaged() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listbooks_paged_async] +// [END example_v1_generated_LibraryService_ListBooks_Paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java index 57d84742ef..34a171a818 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listbooks_sync] +// [START example_v1_generated_LibraryService_ListBooks_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ListBooksRequest; @@ -47,4 +47,4 @@ public static void syncListBooks() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listbooks_sync] +// [END example_v1_generated_LibraryService_ListBooks_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java index e952a2db7b..fc80b4f278 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listbooks_shelfname_sync] +// [START example_v1_generated_LibraryService_ListBooks_Shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listbooks_shelfname_sync] +// [END example_v1_generated_LibraryService_ListBooks_Shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java index 5a581add94..e1b8889824 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listbooks_string_sync] +// [START example_v1_generated_LibraryService_ListBooks_String_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listbooks_string_sync] +// [END example_v1_generated_LibraryService_ListBooks_String_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java index 0d45b07458..a211012179 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listshelves_async] +// [START example_v1_generated_LibraryService_ListShelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; @@ -48,4 +48,4 @@ public static void asyncListShelves() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listshelves_async] +// [END example_v1_generated_LibraryService_ListShelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java index 85dcf4049b..b4c6b47d3e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listshelves_paged_async] +// [START example_v1_generated_LibraryService_ListShelves_Paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.ListShelvesRequest; @@ -56,4 +56,4 @@ public static void asyncListShelvesPaged() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listshelves_paged_async] +// [END example_v1_generated_LibraryService_ListShelves_Paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java index e8d44e3511..05a25be7c7 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_listshelves_sync] +// [START example_v1_generated_LibraryService_ListShelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; import com.google.example.library.v1.Shelf; @@ -45,4 +45,4 @@ public static void syncListShelves() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_listshelves_sync] +// [END example_v1_generated_LibraryService_ListShelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java index 5dc9c53a6b..c987d1f46a 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_async] +// [START example_v1_generated_LibraryService_MergeShelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; @@ -47,4 +47,4 @@ public static void asyncMergeShelves() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_async] +// [END example_v1_generated_LibraryService_MergeShelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java index 3a64bddc08..789de5490d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_sync] +// [START example_v1_generated_LibraryService_MergeShelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; import com.google.example.library.v1.Shelf; @@ -44,4 +44,4 @@ public static void syncMergeShelves() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_sync] +// [END example_v1_generated_LibraryService_MergeShelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java index af84c48d3b..db19cd564f 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] +// [START example_v1_generated_LibraryService_MergeShelves_ShelfnameShelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] +// [END example_v1_generated_LibraryService_MergeShelves_ShelfnameShelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java index e88240c32f..e0d1e6e92e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] +// [START example_v1_generated_LibraryService_MergeShelves_ShelfnameString_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] +// [END example_v1_generated_LibraryService_MergeShelves_ShelfnameString_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java index 31a440ea6f..069e1c53a9 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] +// [START example_v1_generated_LibraryService_MergeShelves_StringShelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] +// [END example_v1_generated_LibraryService_MergeShelves_StringShelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java index 8742a51ff6..a43b537dff 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] +// [START example_v1_generated_LibraryService_MergeShelves_StringString_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] +// [END example_v1_generated_LibraryService_MergeShelves_StringString_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java index 9f085bda34..d708cf7261 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_async] +// [START example_v1_generated_LibraryService_MoveBook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -48,4 +48,4 @@ public static void asyncMoveBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_async] +// [END example_v1_generated_LibraryService_MoveBook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java index 99259bf445..f6550c13c4 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_sync] +// [START example_v1_generated_LibraryService_MoveBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -45,4 +45,4 @@ public static void syncMoveBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_sync] +// [END example_v1_generated_LibraryService_MoveBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java index 6381bac0cd..99c1fd34f9 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] +// [START example_v1_generated_LibraryService_MoveBook_BooknameShelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] +// [END example_v1_generated_LibraryService_MoveBook_BooknameShelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java index 479dc95ea1..c9054e654d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_booknamestring_sync] +// [START example_v1_generated_LibraryService_MoveBook_BooknameString_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_booknamestring_sync] +// [END example_v1_generated_LibraryService_MoveBook_BooknameString_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java index e08d509fab..be18f93ee6 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] +// [START example_v1_generated_LibraryService_MoveBook_StringShelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringShelfname() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] +// [END example_v1_generated_LibraryService_MoveBook_StringShelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java index a3cca84350..f138247526 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_movebook_stringstring_sync] +// [START example_v1_generated_LibraryService_MoveBook_StringString_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringString() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_movebook_stringstring_sync] +// [END example_v1_generated_LibraryService_MoveBook_StringString_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java index 7f6be01fc1..f2d4c0b210 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_updatebook_async] +// [START example_v1_generated_LibraryService_UpdateBook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncUpdateBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_updatebook_async] +// [END example_v1_generated_LibraryService_UpdateBook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java index 81e7750c21..cf7e3d0518 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_updatebook_sync] +// [START example_v1_generated_LibraryService_UpdateBook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.UpdateBookRequest; @@ -44,4 +44,4 @@ public static void syncUpdateBook() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_updatebook_sync] +// [END example_v1_generated_LibraryService_UpdateBook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java index 78e82287d4..d35550ea87 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] +// [START example_v1_generated_LibraryService_UpdateBook_BookFieldmask_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.protobuf.FieldMask; @@ -40,4 +40,4 @@ public static void syncUpdateBookBookFieldmask() throws Exception { } } } -// [END example_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] +// [END example_v1_generated_LibraryService_UpdateBook_BookFieldmask_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java index 27b0379489..f308ba1d66 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_libraryservicesettings_createshelf_sync] +// [START example_v1_generated_LibraryServiceSettings_CreateShelf_sync] import com.google.cloud.example.library.v1.LibraryServiceSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END example_v1_generated_libraryservicesettings_createshelf_sync] +// [END example_v1_generated_LibraryServiceSettings_CreateShelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java index 8f00ce9db7..0634f4ea7c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.stub.samples; -// [START example_v1_generated_libraryservicestubsettings_createshelf_sync] +// [START example_v1_generated_LibraryServiceStubSettings_CreateShelf_sync] import com.google.cloud.example.library.v1.stub.LibraryServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceStubSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END example_v1_generated_libraryservicestubsettings_createshelf_sync] +// [END example_v1_generated_LibraryServiceStubSettings_CreateShelf_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java index f2f4066308..432e6b9e51 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_create_setcredentialsprovider_sync] +// [START logging_v2_generated_Config_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_configclient_create_setcredentialsprovider_sync] +// [END logging_v2_generated_Config_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java index afec2022d9..86efaf695f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_create_setendpoint_sync] +// [START logging_v2_generated_Config_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_configclient_create_setendpoint_sync] +// [END logging_v2_generated_Config_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java index 9455e1f583..06be0eddaf 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createbucket_async] +// [START logging_v2_generated_Config_CreateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; @@ -48,4 +48,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_createbucket_async] +// [END logging_v2_generated_Config_CreateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java index 44a2380e7f..f38b8b932f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createbucket_sync] +// [START logging_v2_generated_Config_CreateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; import com.google.logging.v2.LocationName; @@ -45,4 +45,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_createbucket_sync] +// [END logging_v2_generated_Config_CreateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java index 5a727225c7..147251209b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_async] +// [START logging_v2_generated_Config_CreateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_createexclusion_async] +// [END logging_v2_generated_Config_CreateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java index 3456f78c79..5ceb46e142 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_createexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java index 40e27846f0..e705079d85 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_billingaccountnamelogexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionBillingaccountnameLogexclusion() throws Ex } } } -// [END logging_v2_generated_configclient_createexclusion_billingaccountnamelogexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java index dc1fabf988..f3f10e65d9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_foldernamelogexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionFoldernameLogexclusion() throws Exception } } } -// [END logging_v2_generated_configclient_createexclusion_foldernamelogexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java index c68db9bcd7..f2ff73a6aa 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_organizationnamelogexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionOrganizationnameLogexclusion() throws Exce } } } -// [END logging_v2_generated_configclient_createexclusion_organizationnamelogexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java index c1e47a5a2d..07f7abd06b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_projectnamelogexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionProjectnameLogexclusion() throws Exception } } } -// [END logging_v2_generated_configclient_createexclusion_projectnamelogexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java index 87cf6e299d..c6080b9067 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createexclusion_stringlogexclusion_sync] +// [START logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionStringLogexclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_createexclusion_stringlogexclusion_sync] +// [END logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java index e03a879bff..0ab887e51e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_async] +// [START logging_v2_generated_Config_CreateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_async] +// [END logging_v2_generated_Config_CreateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java index fa2ad4fc9f..c68927ba9c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_sync] +// [START logging_v2_generated_Config_CreateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; import com.google.logging.v2.LogSink; @@ -45,4 +45,4 @@ public static void syncCreateSink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_sync] +// [END logging_v2_generated_Config_CreateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java index 572a3098c3..3c639f4b92 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_billingaccountnamelogsink_sync] +// [START logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkBillingaccountnameLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_billingaccountnamelogsink_sync] +// [END logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java index 582f363830..24d9a1b890 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_foldernamelogsink_sync] +// [START logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkFoldernameLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_foldernamelogsink_sync] +// [END logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java index c1398c0c1d..db8b873e53 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_organizationnamelogsink_sync] +// [START logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateSinkOrganizationnameLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_organizationnamelogsink_sync] +// [END logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java index 280f8ec9e0..4f2297db7d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_projectnamelogsink_sync] +// [START logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkProjectnameLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_projectnamelogsink_sync] +// [END logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java index 7b89426a58..c496d95bd6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createsink_stringlogsink_sync] +// [START logging_v2_generated_Config_CreateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_createsink_stringlogsink_sync] +// [END logging_v2_generated_Config_CreateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java index 7d8fe181c4..16454ea53a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createview_async] +// [START logging_v2_generated_Config_CreateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; @@ -47,4 +47,4 @@ public static void asyncCreateView() throws Exception { } } } -// [END logging_v2_generated_configclient_createview_async] +// [END logging_v2_generated_Config_CreateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java index 3f256b822c..3ff765e96b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_createview_sync] +// [START logging_v2_generated_Config_CreateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; import com.google.logging.v2.LogView; @@ -44,4 +44,4 @@ public static void syncCreateView() throws Exception { } } } -// [END logging_v2_generated_configclient_createview_sync] +// [END logging_v2_generated_Config_CreateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java index bfad9cc3ad..42fa415a17 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletebucket_async] +// [START logging_v2_generated_Config_DeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_deletebucket_async] +// [END logging_v2_generated_Config_DeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java index b17b55d73c..1ce7361f17 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletebucket_sync] +// [START logging_v2_generated_Config_DeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; import com.google.logging.v2.LogBucketName; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_deletebucket_sync] +// [END logging_v2_generated_Config_DeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java index 6f8071f018..02b7bc6c5f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteexclusion_async] +// [START logging_v2_generated_Config_DeleteExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteexclusion_async] +// [END logging_v2_generated_Config_DeleteExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java index b37027a8d7..659b84d869 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteexclusion_sync] +// [START logging_v2_generated_Config_DeleteExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; import com.google.logging.v2.LogExclusionName; @@ -44,4 +44,4 @@ public static void syncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteexclusion_sync] +// [END logging_v2_generated_Config_DeleteExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java index 38770a232b..a135f9394e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteexclusion_logexclusionname_sync] +// [START logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteexclusion_logexclusionname_sync] +// [END logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java index 83491e1cb9..8fc355ff88 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteexclusion_string_sync] +// [START logging_v2_generated_Config_DeleteExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionString() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteexclusion_string_sync] +// [END logging_v2_generated_Config_DeleteExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java index 1f50e2f00a..8eb8c5aa9a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletesink_async] +// [START logging_v2_generated_Config_DeleteSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_configclient_deletesink_async] +// [END logging_v2_generated_Config_DeleteSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java index 3f509965ad..4ddf4b4d74 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletesink_sync] +// [START logging_v2_generated_Config_DeleteSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; import com.google.logging.v2.LogSinkName; @@ -43,4 +43,4 @@ public static void syncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_configclient_deletesink_sync] +// [END logging_v2_generated_Config_DeleteSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java index 98b7d0132e..5800d2bc8b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletesink_logsinkname_sync] +// [START logging_v2_generated_Config_DeleteSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_configclient_deletesink_logsinkname_sync] +// [END logging_v2_generated_Config_DeleteSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java index b661f1dac6..461e1e00ce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deletesink_string_sync] +// [START logging_v2_generated_Config_DeleteSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkString() throws Exception { } } } -// [END logging_v2_generated_configclient_deletesink_string_sync] +// [END logging_v2_generated_Config_DeleteSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java index 7f6431c943..050edd8160 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteview_async] +// [START logging_v2_generated_Config_DeleteView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteView() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteview_async] +// [END logging_v2_generated_Config_DeleteView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java index 6b414f800d..b7be382fa1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_deleteview_sync] +// [START logging_v2_generated_Config_DeleteView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; import com.google.logging.v2.LogViewName; @@ -46,4 +46,4 @@ public static void syncDeleteView() throws Exception { } } } -// [END logging_v2_generated_configclient_deleteview_sync] +// [END logging_v2_generated_Config_DeleteView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java index 6157506a15..b88c0bf58e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getbucket_async] +// [START logging_v2_generated_Config_GetBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; @@ -48,4 +48,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_getbucket_async] +// [END logging_v2_generated_Config_GetBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java index 289ecd07cf..76f8f64dcd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getbucket_sync] +// [START logging_v2_generated_Config_GetBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; import com.google.logging.v2.LogBucket; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_getbucket_sync] +// [END logging_v2_generated_Config_GetBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java index c5db5ddfa0..a1a38dbe27 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getcmeksettings_async] +// [START logging_v2_generated_Config_GetCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -46,4 +46,4 @@ public static void asyncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_configclient_getcmeksettings_async] +// [END logging_v2_generated_Config_GetCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java index ff80e74e33..cedb4e7bf4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getcmeksettings_sync] +// [START logging_v2_generated_Config_GetCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.CmekSettingsName; @@ -43,4 +43,4 @@ public static void syncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_configclient_getcmeksettings_sync] +// [END logging_v2_generated_Config_GetCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java index 05a03f2bfe..0915b1c70b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getexclusion_async] +// [START logging_v2_generated_Config_GetExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_getexclusion_async] +// [END logging_v2_generated_Config_GetExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java index 2eb5d880d6..3419efced1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getexclusion_sync] +// [START logging_v2_generated_Config_GetExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_getexclusion_sync] +// [END logging_v2_generated_Config_GetExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java index 3820286ea5..42483f6648 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getexclusion_logexclusionname_sync] +// [START logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_configclient_getexclusion_logexclusionname_sync] +// [END logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java index e67d873b5d..07b2643c50 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getexclusion_string_sync] +// [START logging_v2_generated_Config_GetExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionString() throws Exception { } } } -// [END logging_v2_generated_configclient_getexclusion_string_sync] +// [END logging_v2_generated_Config_GetExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java index 423c78be9b..851a6d9460 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getsink_async] +// [START logging_v2_generated_Config_GetSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; @@ -46,4 +46,4 @@ public static void asyncGetSink() throws Exception { } } } -// [END logging_v2_generated_configclient_getsink_async] +// [END logging_v2_generated_Config_GetSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java index c29e05d6e3..6c39d0fe51 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getsink_sync] +// [START logging_v2_generated_Config_GetSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; import com.google.logging.v2.LogSink; @@ -43,4 +43,4 @@ public static void syncGetSink() throws Exception { } } } -// [END logging_v2_generated_configclient_getsink_sync] +// [END logging_v2_generated_Config_GetSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java index 358e9b90b7..3a4b4ff9d8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getsink_logsinkname_sync] +// [START logging_v2_generated_Config_GetSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_configclient_getsink_logsinkname_sync] +// [END logging_v2_generated_Config_GetSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java index 24f09d1911..1221c48ce9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getsink_string_sync] +// [START logging_v2_generated_Config_GetSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkString() throws Exception { } } } -// [END logging_v2_generated_configclient_getsink_string_sync] +// [END logging_v2_generated_Config_GetSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java index d86f2b1b20..3bfc68cd76 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getview_async] +// [START logging_v2_generated_Config_GetView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; @@ -49,4 +49,4 @@ public static void asyncGetView() throws Exception { } } } -// [END logging_v2_generated_configclient_getview_async] +// [END logging_v2_generated_Config_GetView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java index 21b1c6a56d..1c9e3010d7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_getview_sync] +// [START logging_v2_generated_Config_GetView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncGetView() throws Exception { } } } -// [END logging_v2_generated_configclient_getview_sync] +// [END logging_v2_generated_Config_GetView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java index 5cb0f97bfe..f8de847d45 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_async] +// [START logging_v2_generated_Config_ListBuckets_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; @@ -50,4 +50,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_async] +// [END logging_v2_generated_Config_ListBuckets_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java index fc067a503a..438dd1ab4f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_paged_async] +// [START logging_v2_generated_Config_ListBuckets_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListBucketsRequest; @@ -58,4 +58,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_paged_async] +// [END logging_v2_generated_Config_ListBuckets_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java index f9adc31ed0..1ceeba8e92 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_sync] +// [START logging_v2_generated_Config_ListBuckets_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; import com.google.logging.v2.LocationName; @@ -47,4 +47,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_sync] +// [END logging_v2_generated_Config_ListBuckets_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java index fe18d0f88d..dc60676d8c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_billingaccountlocationname_sync] +// [START logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountLocationName; import com.google.logging.v2.LogBucket; @@ -42,4 +42,4 @@ public static void syncListBucketsBillingaccountlocationname() throws Exception } } } -// [END logging_v2_generated_configclient_listbuckets_billingaccountlocationname_sync] +// [END logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java index f0f250172e..08b69d8380 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_folderlocationname_sync] +// [START logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderLocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsFolderlocationname() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_folderlocationname_sync] +// [END logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java index b00f3902e7..e7eef6601c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_locationname_sync] +// [START logging_v2_generated_Config_ListBuckets_Locationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsLocationname() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_locationname_sync] +// [END logging_v2_generated_Config_ListBuckets_Locationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java index d5ceef258d..80c27cb25c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_organizationlocationname_sync] +// [START logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.OrganizationLocationName; @@ -41,4 +41,4 @@ public static void syncListBucketsOrganizationlocationname() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_organizationlocationname_sync] +// [END logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java index a8148fe4f0..3dc2e09663 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listbuckets_string_sync] +// [START logging_v2_generated_Config_ListBuckets_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END logging_v2_generated_configclient_listbuckets_string_sync] +// [END logging_v2_generated_Config_ListBuckets_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java index dec620d85c..b5b751e512 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_async] +// [START logging_v2_generated_Config_ListExclusions_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; @@ -51,4 +51,4 @@ public static void asyncListExclusions() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_async] +// [END logging_v2_generated_Config_ListExclusions_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java index bfe5d1fb3d..dcc315a987 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_paged_async] +// [START logging_v2_generated_Config_ListExclusions_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListExclusionsRequest; @@ -58,4 +58,4 @@ public static void asyncListExclusionsPaged() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_paged_async] +// [END logging_v2_generated_Config_ListExclusions_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java index c069af988b..50fcbb7413 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_sync] +// [START logging_v2_generated_Config_ListExclusions_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; import com.google.logging.v2.LogExclusion; @@ -47,4 +47,4 @@ public static void syncListExclusions() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_sync] +// [END logging_v2_generated_Config_ListExclusions_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java index e7ac9c19e1..9939428ec0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_billingaccountname_sync] +// [START logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_billingaccountname_sync] +// [END logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java index 4c2f70e3e6..3008fc13a1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_foldername_sync] +// [START logging_v2_generated_Config_ListExclusions_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsFoldername() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_foldername_sync] +// [END logging_v2_generated_Config_ListExclusions_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java index 06ff515d5d..457259ff27 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_organizationname_sync] +// [START logging_v2_generated_Config_ListExclusions_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListExclusionsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_organizationname_sync] +// [END logging_v2_generated_Config_ListExclusions_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java index a71c637173..087d4e7241 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_projectname_sync] +// [START logging_v2_generated_Config_ListExclusions_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsProjectname() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_projectname_sync] +// [END logging_v2_generated_Config_ListExclusions_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java index 780159346c..29eab9f45b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listexclusions_string_sync] +// [START logging_v2_generated_Config_ListExclusions_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsString() throws Exception { } } } -// [END logging_v2_generated_configclient_listexclusions_string_sync] +// [END logging_v2_generated_Config_ListExclusions_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java index 46a682b0c0..bf52d0e488 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_async] +// [START logging_v2_generated_Config_ListSinks_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; @@ -50,4 +50,4 @@ public static void asyncListSinks() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_async] +// [END logging_v2_generated_Config_ListSinks_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java index 93d3ff719c..66fc641d8b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_paged_async] +// [START logging_v2_generated_Config_ListSinks_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListSinksRequest; @@ -58,4 +58,4 @@ public static void asyncListSinksPaged() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_paged_async] +// [END logging_v2_generated_Config_ListSinks_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java index 64d444f784..28a7508ada 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_sync] +// [START logging_v2_generated_Config_ListSinks_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; import com.google.logging.v2.LogSink; @@ -47,4 +47,4 @@ public static void syncListSinks() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_sync] +// [END logging_v2_generated_Config_ListSinks_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java index c0dde5f359..f90b7ddf60 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_billingaccountname_sync] +// [START logging_v2_generated_Config_ListSinks_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_billingaccountname_sync] +// [END logging_v2_generated_Config_ListSinks_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java index 797aa9ab66..ac9330d556 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_foldername_sync] +// [START logging_v2_generated_Config_ListSinks_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksFoldername() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_foldername_sync] +// [END logging_v2_generated_Config_ListSinks_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java index a6f77fb803..110aff10e2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_organizationname_sync] +// [START logging_v2_generated_Config_ListSinks_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListSinksOrganizationname() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_organizationname_sync] +// [END logging_v2_generated_Config_ListSinks_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java index 345a523d78..991cf621c6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_projectname_sync] +// [START logging_v2_generated_Config_ListSinks_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksProjectname() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_projectname_sync] +// [END logging_v2_generated_Config_ListSinks_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java index be0f4d5962..251b54b9cd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listsinks_string_sync] +// [START logging_v2_generated_Config_ListSinks_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksString() throws Exception { } } } -// [END logging_v2_generated_configclient_listsinks_string_sync] +// [END logging_v2_generated_Config_ListSinks_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java index d864049690..5063a7df09 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listviews_async] +// [START logging_v2_generated_Config_ListViews_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; @@ -49,4 +49,4 @@ public static void asyncListViews() throws Exception { } } } -// [END logging_v2_generated_configclient_listviews_async] +// [END logging_v2_generated_Config_ListViews_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java index 1128e0c953..8e2b30f750 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listviews_paged_async] +// [START logging_v2_generated_Config_ListViews_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListViewsRequest; @@ -57,4 +57,4 @@ public static void asyncListViewsPaged() throws Exception { } } } -// [END logging_v2_generated_configclient_listviews_paged_async] +// [END logging_v2_generated_Config_ListViews_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java index 952e9a693b..65ab409b36 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listviews_sync] +// [START logging_v2_generated_Config_ListViews_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncListViews() throws Exception { } } } -// [END logging_v2_generated_configclient_listviews_sync] +// [END logging_v2_generated_Config_ListViews_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java index 8823b13a83..90d4eb7a3f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_listviews_string_sync] +// [START logging_v2_generated_Config_ListViews_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -40,4 +40,4 @@ public static void syncListViewsString() throws Exception { } } } -// [END logging_v2_generated_configclient_listviews_string_sync] +// [END logging_v2_generated_Config_ListViews_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java index 3ce4cbddee..4ac4f21600 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_undeletebucket_async] +// [START logging_v2_generated_Config_UndeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void asyncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_undeletebucket_async] +// [END logging_v2_generated_Config_UndeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java index 084e5535f4..a6d397c7bb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_undeletebucket_sync] +// [START logging_v2_generated_Config_UndeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; import com.google.logging.v2.UndeleteBucketRequest; @@ -45,4 +45,4 @@ public static void syncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_undeletebucket_sync] +// [END logging_v2_generated_Config_UndeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java index 0f0c1b04be..2bdf045fef 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatebucket_async] +// [START logging_v2_generated_Config_UpdateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; @@ -51,4 +51,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_updatebucket_async] +// [END logging_v2_generated_Config_UpdateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java index dc2a527241..6bc0a81437 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatebucket_sync] +// [START logging_v2_generated_Config_UpdateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_configclient_updatebucket_sync] +// [END logging_v2_generated_Config_UpdateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java index 7dbb0368ce..075afc71d9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatecmeksettings_async] +// [START logging_v2_generated_Config_UpdateCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -49,4 +49,4 @@ public static void asyncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_configclient_updatecmeksettings_async] +// [END logging_v2_generated_Config_UpdateCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java index d3792e3208..066db0f221 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatecmeksettings_sync] +// [START logging_v2_generated_Config_UpdateCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.UpdateCmekSettingsRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_configclient_updatecmeksettings_sync] +// [END logging_v2_generated_Config_UpdateCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java index e55d0d0fe9..e2c794e348 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateexclusion_async] +// [START logging_v2_generated_Config_UpdateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; @@ -50,4 +50,4 @@ public static void asyncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_updateexclusion_async] +// [END logging_v2_generated_Config_UpdateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java index 1db3dc488a..635ae3138a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateexclusion_sync] +// [START logging_v2_generated_Config_UpdateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -47,4 +47,4 @@ public static void syncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_configclient_updateexclusion_sync] +// [END logging_v2_generated_Config_UpdateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java index 78a1e5a986..019d31b844 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateexclusion_logexclusionnamelogexclusionfieldmask_sync] +// [START logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionLogexclusionnameLogexclusionFieldmask() th } } } -// [END logging_v2_generated_configclient_updateexclusion_logexclusionnamelogexclusionfieldmask_sync] +// [END logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java index 75c16f8cae..0382f5dd3c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateexclusion_stringlogexclusionfieldmask_sync] +// [START logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionStringLogexclusionFieldmask() throws Excep } } } -// [END logging_v2_generated_configclient_updateexclusion_stringlogexclusionfieldmask_sync] +// [END logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java index 7fcf0bdf1c..ab63f731ff 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_async] +// [START logging_v2_generated_Config_UpdateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; @@ -50,4 +50,4 @@ public static void asyncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_configclient_updatesink_async] +// [END logging_v2_generated_Config_UpdateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java index 7c8807c8af..a642e8af7f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_sync] +// [START logging_v2_generated_Config_UpdateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -47,4 +47,4 @@ public static void syncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_configclient_updatesink_sync] +// [END logging_v2_generated_Config_UpdateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java index 78a81f8937..8a6d30e840 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_logsinknamelogsink_sync] +// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkLogsinknameLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_updatesink_logsinknamelogsink_sync] +// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java index e06b9c774c..32323d55d3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_logsinknamelogsinkfieldmask_sync] +// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkLogsinknameLogsinkFieldmask() throws Exception } } } -// [END logging_v2_generated_configclient_updatesink_logsinknamelogsinkfieldmask_sync] +// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java index 86cc0f5b95..8e7effd922 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_stringlogsink_sync] +// [START logging_v2_generated_Config_UpdateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_configclient_updatesink_stringlogsink_sync] +// [END logging_v2_generated_Config_UpdateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java index b7f8f65122..1c7601f9e8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updatesink_stringlogsinkfieldmask_sync] +// [START logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkStringLogsinkFieldmask() throws Exception { } } } -// [END logging_v2_generated_configclient_updatesink_stringlogsinkfieldmask_sync] +// [END logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java index 3f0daf24c3..d184350a61 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateview_async] +// [START logging_v2_generated_Config_UpdateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -48,4 +48,4 @@ public static void asyncUpdateView() throws Exception { } } } -// [END logging_v2_generated_configclient_updateview_async] +// [END logging_v2_generated_Config_UpdateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java index d1d3117133..de3ed279b0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configclient_updateview_sync] +// [START logging_v2_generated_Config_UpdateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; import com.google.logging.v2.UpdateViewRequest; @@ -45,4 +45,4 @@ public static void syncUpdateView() throws Exception { } } } -// [END logging_v2_generated_configclient_updateview_sync] +// [END logging_v2_generated_Config_UpdateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java index 53cfac1f8f..4ce5011311 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_configsettings_getbucket_sync] +// [START logging_v2_generated_ConfigSettings_GetBucket_sync] import com.google.cloud.logging.v2.ConfigSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { ConfigSettings configSettings = configSettingsBuilder.build(); } } -// [END logging_v2_generated_configsettings_getbucket_sync] +// [END logging_v2_generated_ConfigSettings_GetBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java index 1e0aca6062..d3e7fce859 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_create_setcredentialsprovider_sync] +// [START logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_loggingclient_create_setcredentialsprovider_sync] +// [END logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java index 22c45b6a90..cc7769f0b0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_create_setendpoint_sync] +// [START logging_v2_generated_Logging_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_loggingclient_create_setendpoint_sync] +// [END logging_v2_generated_Logging_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java index 0c04352731..65dfbf6fc4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_deletelog_async] +// [START logging_v2_generated_Logging_DeleteLog_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_loggingclient_deletelog_async] +// [END logging_v2_generated_Logging_DeleteLog_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java index 92d383e7cb..f58e35379b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_deletelog_sync] +// [START logging_v2_generated_Logging_DeleteLog_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.LogName; @@ -43,4 +43,4 @@ public static void syncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_loggingclient_deletelog_sync] +// [END logging_v2_generated_Logging_DeleteLog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java index 6a76c31d20..c12ea2f593 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_deletelog_logname_sync] +// [START logging_v2_generated_Logging_DeleteLog_Logname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogLogname() throws Exception { } } } -// [END logging_v2_generated_loggingclient_deletelog_logname_sync] +// [END logging_v2_generated_Logging_DeleteLog_Logname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java index 65d291b1bc..fe86078e27 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_deletelog_string_sync] +// [START logging_v2_generated_Logging_DeleteLog_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogString() throws Exception { } } } -// [END logging_v2_generated_loggingclient_deletelog_string_sync] +// [END logging_v2_generated_Logging_DeleteLog_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java index c169336b22..ef5d7e8ccb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogentries_async] +// [START logging_v2_generated_Logging_ListLogEntries_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogentries_async] +// [END logging_v2_generated_Logging_ListLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java index 311f40bbd9..2bfb1b6c3f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogentries_paged_async] +// [START logging_v2_generated_Logging_ListLogEntries_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogEntriesRequest; @@ -60,4 +60,4 @@ public static void asyncListLogEntriesPaged() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogentries_paged_async] +// [END logging_v2_generated_Logging_ListLogEntries_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java index e8b582e400..94861f9571 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogentries_sync] +// [START logging_v2_generated_Logging_ListLogEntries_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; import com.google.logging.v2.LogEntry; @@ -49,4 +49,4 @@ public static void syncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogentries_sync] +// [END logging_v2_generated_Logging_ListLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java index 1bcaaf470e..94ce4dac9a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogentries_liststringstringstring_sync] +// [START logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncListLogEntriesListstringStringString() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogentries_liststringstringstring_sync] +// [END logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java index bc7e1709c3..6152c9cb13 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_async] +// [START logging_v2_generated_Logging_ListLogs_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; @@ -51,4 +51,4 @@ public static void asyncListLogs() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_async] +// [END logging_v2_generated_Logging_ListLogs_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java index 18e4bd70d9..e2b6c24eab 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_paged_async] +// [START logging_v2_generated_Logging_ListLogs_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogsRequest; @@ -59,4 +59,4 @@ public static void asyncListLogsPaged() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_paged_async] +// [END logging_v2_generated_Logging_ListLogs_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java index 141b91f95f..ad9b101fe9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_sync] +// [START logging_v2_generated_Logging_ListLogs_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; import com.google.logging.v2.ProjectName; @@ -48,4 +48,4 @@ public static void syncListLogs() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_sync] +// [END logging_v2_generated_Logging_ListLogs_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java index ca034d54fb..ea94e648b7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_billingaccountname_sync] +// [START logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.BillingAccountName; @@ -40,4 +40,4 @@ public static void syncListLogsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_billingaccountname_sync] +// [END logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java index 07aec77925..97385d41dc 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_foldername_sync] +// [START logging_v2_generated_Logging_ListLogs_Foldername_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.FolderName; @@ -40,4 +40,4 @@ public static void syncListLogsFoldername() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_foldername_sync] +// [END logging_v2_generated_Logging_ListLogs_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java index ac63a26b68..f217a490ab 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_organizationname_sync] +// [START logging_v2_generated_Logging_ListLogs_Organizationname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncListLogsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_organizationname_sync] +// [END logging_v2_generated_Logging_ListLogs_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java index 4ce1d9fe0b..baeac438a0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_projectname_sync] +// [START logging_v2_generated_Logging_ListLogs_Projectname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsProjectname() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_projectname_sync] +// [END logging_v2_generated_Logging_ListLogs_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java index 99b9cb3437..343ea0797d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listlogs_string_sync] +// [START logging_v2_generated_Logging_ListLogs_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsString() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listlogs_string_sync] +// [END logging_v2_generated_Logging_ListLogs_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java index a24c719686..0393705c87 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_async] +// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -49,4 +49,4 @@ public static void asyncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_async] +// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java index 389ac1437d..a60e62e53f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_paged_async] +// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; @@ -57,4 +57,4 @@ public static void asyncListMonitoredResourceDescriptorsPaged() throws Exception } } } -// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_paged_async] +// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java index 10f2bd95d2..0240d0ae20 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_sync] +// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest; @@ -46,4 +46,4 @@ public static void syncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_sync] +// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java index 11ad1e4b8a..04500ea8a9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_taillogentries_async] +// [START logging_v2_generated_Logging_TailLogEntries_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.TailLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncTailLogEntries() throws Exception { } } } -// [END logging_v2_generated_loggingclient_taillogentries_async] +// [END logging_v2_generated_Logging_TailLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java index 9669ae5aa9..b8aac8db89 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_writelogentries_async] +// [START logging_v2_generated_Logging_WriteLogEntries_async] import com.google.api.MonitoredResource; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -56,4 +56,4 @@ public static void asyncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_loggingclient_writelogentries_async] +// [END logging_v2_generated_Logging_WriteLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java index 034a50c322..649f1366b9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_writelogentries_sync] +// [START logging_v2_generated_Logging_WriteLogEntries_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -52,4 +52,4 @@ public static void syncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_loggingclient_writelogentries_sync] +// [END logging_v2_generated_Logging_WriteLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java index b122e0ca59..65ba673580 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_writelogentries_lognamemonitoredresourcemapstringstringlistlogentry_sync] +// [START logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesLognameMonitoredresourceMapstringstringLis } } } -// [END logging_v2_generated_loggingclient_writelogentries_lognamemonitoredresourcemapstringstringlistlogentry_sync] +// [END logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java index 90432747f1..d69e7f5f35 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingclient_writelogentries_stringmonitoredresourcemapstringstringlistlogentry_sync] +// [START logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesStringMonitoredresourceMapstringstringList } } } -// [END logging_v2_generated_loggingclient_writelogentries_stringmonitoredresourcemapstringstringlistlogentry_sync] +// [END logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java index 0eeb1e8ec1..11841688ba 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_loggingsettings_deletelog_sync] +// [START logging_v2_generated_LoggingSettings_DeleteLog_sync] import com.google.cloud.logging.v2.LoggingSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteLog() throws Exception { LoggingSettings loggingSettings = loggingSettingsBuilder.build(); } } -// [END logging_v2_generated_loggingsettings_deletelog_sync] +// [END logging_v2_generated_LoggingSettings_DeleteLog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java index 4a7fad7c9c..2b202407d3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_create_setcredentialsprovider_sync] +// [START logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_metricsclient_create_setcredentialsprovider_sync] +// [END logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java index f619e9fcd8..74cba5dfc8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_create_setendpoint_sync] +// [START logging_v2_generated_Metrics_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_metricsclient_create_setendpoint_sync] +// [END logging_v2_generated_Metrics_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java index 4bd3ba3186..bedd6dc546 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_createlogmetric_async] +// [START logging_v2_generated_Metrics_CreateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; @@ -47,4 +47,4 @@ public static void asyncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_createlogmetric_async] +// [END logging_v2_generated_Metrics_CreateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java index a88b849b70..f8fd7a6882 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_createlogmetric_sync] +// [START logging_v2_generated_Metrics_CreateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -44,4 +44,4 @@ public static void syncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_createlogmetric_sync] +// [END logging_v2_generated_Metrics_CreateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java index abe243b3ce..25844b26af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_createlogmetric_projectnamelogmetric_sync] +// [START logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricProjectnameLogmetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_createlogmetric_projectnamelogmetric_sync] +// [END logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java index 7c6ae95efa..0f3b22f116 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_createlogmetric_stringlogmetric_sync] +// [START logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_createlogmetric_stringlogmetric_sync] +// [END logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java index aeaaa68a98..fabe228bf2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_deletelogmetric_async] +// [START logging_v2_generated_Metrics_DeleteLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_deletelogmetric_async] +// [END logging_v2_generated_Metrics_DeleteLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java index 246790429f..5130f428fa 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_deletelogmetric_sync] +// [START logging_v2_generated_Metrics_DeleteLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; import com.google.logging.v2.LogMetricName; @@ -43,4 +43,4 @@ public static void syncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_deletelogmetric_sync] +// [END logging_v2_generated_Metrics_DeleteLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java index 46b6b255ff..a512881e8f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_deletelogmetric_logmetricname_sync] +// [START logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_metricsclient_deletelogmetric_logmetricname_sync] +// [END logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java index 8cb923cf77..ac60ed04e7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_deletelogmetric_string_sync] +// [START logging_v2_generated_Metrics_DeleteLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricString() throws Exception { } } } -// [END logging_v2_generated_metricsclient_deletelogmetric_string_sync] +// [END logging_v2_generated_Metrics_DeleteLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java index b7db353cf2..32808dc48b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_getlogmetric_async] +// [START logging_v2_generated_Metrics_GetLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_getlogmetric_async] +// [END logging_v2_generated_Metrics_GetLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java index a9970e2b40..b73437233f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_getlogmetric_sync] +// [START logging_v2_generated_Metrics_GetLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -43,4 +43,4 @@ public static void syncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_getlogmetric_sync] +// [END logging_v2_generated_Metrics_GetLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java index d2c15e1c46..9fe81972fb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_getlogmetric_logmetricname_sync] +// [START logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_metricsclient_getlogmetric_logmetricname_sync] +// [END logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java index da9854a0df..49336d172d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_getlogmetric_string_sync] +// [START logging_v2_generated_Metrics_GetLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricString() throws Exception { } } } -// [END logging_v2_generated_metricsclient_getlogmetric_string_sync] +// [END logging_v2_generated_Metrics_GetLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java index 27a380cec9..9baa82c72e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_listlogmetrics_async] +// [START logging_v2_generated_Metrics_ListLogMetrics_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; @@ -50,4 +50,4 @@ public static void asyncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_metricsclient_listlogmetrics_async] +// [END logging_v2_generated_Metrics_ListLogMetrics_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java index 2d9de6a783..e403a31d81 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_listlogmetrics_paged_async] +// [START logging_v2_generated_Metrics_ListLogMetrics_Paged_async] import com.google.cloud.logging.v2.MetricsClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogMetricsRequest; @@ -58,4 +58,4 @@ public static void asyncListLogMetricsPaged() throws Exception { } } } -// [END logging_v2_generated_metricsclient_listlogmetrics_paged_async] +// [END logging_v2_generated_Metrics_ListLogMetrics_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java index 2ac1b067e8..4cd6c5b24a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_listlogmetrics_sync] +// [START logging_v2_generated_Metrics_ListLogMetrics_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void syncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_metricsclient_listlogmetrics_sync] +// [END logging_v2_generated_Metrics_ListLogMetrics_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java index cf6269ed8a..c9311ec6f5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_listlogmetrics_projectname_sync] +// [START logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsProjectname() throws Exception { } } } -// [END logging_v2_generated_metricsclient_listlogmetrics_projectname_sync] +// [END logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java index 9ed1d30246..f549e4fcfd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_listlogmetrics_string_sync] +// [START logging_v2_generated_Metrics_ListLogMetrics_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsString() throws Exception { } } } -// [END logging_v2_generated_metricsclient_listlogmetrics_string_sync] +// [END logging_v2_generated_Metrics_ListLogMetrics_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java index f7b38ecde5..b5b805473b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_updatelogmetric_async] +// [START logging_v2_generated_Metrics_UpdateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void asyncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_updatelogmetric_async] +// [END logging_v2_generated_Metrics_UpdateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java index 3130ade661..d9ddd5cabf 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_updatelogmetric_sync] +// [START logging_v2_generated_Metrics_UpdateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -44,4 +44,4 @@ public static void syncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_updatelogmetric_sync] +// [END logging_v2_generated_Metrics_UpdateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java index 350e4dedc8..95afee63f1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_updatelogmetric_logmetricnamelogmetric_sync] +// [START logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricLogmetricnameLogmetric() throws Exception } } } -// [END logging_v2_generated_metricsclient_updatelogmetric_logmetricnamelogmetric_sync] +// [END logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java index ef975ac05c..72d5b2a914 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricsclient_updatelogmetric_stringlogmetric_sync] +// [START logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_metricsclient_updatelogmetric_stringlogmetric_sync] +// [END logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java index 8d790e3197..7827c8c0a8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_metricssettings_getlogmetric_sync] +// [START logging_v2_generated_MetricsSettings_GetLogMetric_sync] import com.google.cloud.logging.v2.MetricsSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetLogMetric() throws Exception { MetricsSettings metricsSettings = metricsSettingsBuilder.build(); } } -// [END logging_v2_generated_metricssettings_getlogmetric_sync] +// [END logging_v2_generated_MetricsSettings_GetLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java index bb2b8d8ed7..cf43da01a2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_configservicev2stubsettings_getbucket_sync] +// [START logging_v2_generated_ConfigServiceV2StubSettings_GetBucket_sync] import com.google.cloud.logging.v2.stub.ConfigServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGetBucket() throws Exception { ConfigServiceV2StubSettings configSettings = configSettingsBuilder.build(); } } -// [END logging_v2_generated_configservicev2stubsettings_getbucket_sync] +// [END logging_v2_generated_ConfigServiceV2StubSettings_GetBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java index c9ea0e0fe6..9dbb84f39f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_loggingservicev2stubsettings_deletelog_sync] +// [START logging_v2_generated_LoggingServiceV2StubSettings_DeleteLog_sync] import com.google.cloud.logging.v2.stub.LoggingServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncDeleteLog() throws Exception { LoggingServiceV2StubSettings loggingSettings = loggingSettingsBuilder.build(); } } -// [END logging_v2_generated_loggingservicev2stubsettings_deletelog_sync] +// [END logging_v2_generated_LoggingServiceV2StubSettings_DeleteLog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java index ef0eed0257..be68fa6143 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_metricsservicev2stubsettings_getlogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2StubSettings_GetLogMetric_sync] import com.google.cloud.logging.v2.stub.MetricsServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGetLogMetric() throws Exception { MetricsServiceV2StubSettings metricsSettings = metricsSettingsBuilder.build(); } } -// [END logging_v2_generated_metricsservicev2stubsettings_getlogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2StubSettings_GetLogMetric_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java index 8d6ba7006e..f66d3eb280 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_create_setcredentialsprovider_sync] +// [START pubsub_v1_generated_SchemaService_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.cloud.pubsub.v1.SchemaServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings); } } -// [END pubsub_v1_generated_schemaserviceclient_create_setcredentialsprovider_sync] +// [END pubsub_v1_generated_SchemaService_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java index 64b754ef54..6fef477696 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_create_setendpoint_sync] +// [START pubsub_v1_generated_SchemaService_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.cloud.pubsub.v1.SchemaServiceSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings); } } -// [END pubsub_v1_generated_schemaserviceclient_create_setendpoint_sync] +// [END pubsub_v1_generated_SchemaService_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java index faf8677a74..8177b54efe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_createschema_async] +// [START pubsub_v1_generated_SchemaService_CreateSchema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.CreateSchemaRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_createschema_async] +// [END pubsub_v1_generated_SchemaService_CreateSchema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java index eb04b75b15..6318c403b5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_createschema_sync] +// [START pubsub_v1_generated_SchemaService_CreateSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.CreateSchemaRequest; import com.google.pubsub.v1.ProjectName; @@ -45,4 +45,4 @@ public static void syncCreateSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_createschema_sync] +// [END pubsub_v1_generated_SchemaService_CreateSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java index 9aa8f43218..63d1ec61c0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_createschema_projectnameschemastring_sync] +// [START pubsub_v1_generated_SchemaService_CreateSchema_ProjectnameSchemaString_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncCreateSchemaProjectnameSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_createschema_projectnameschemastring_sync] +// [END pubsub_v1_generated_SchemaService_CreateSchema_ProjectnameSchemaString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java index 8fd4669d1e..e1e42c77df 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_createschema_stringschemastring_sync] +// [START pubsub_v1_generated_SchemaService_CreateSchema_StringSchemaString_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncCreateSchemaStringSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_createschema_stringschemastring_sync] +// [END pubsub_v1_generated_SchemaService_CreateSchema_StringSchemaString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java index 07b999d269..e278448b05 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_deleteschema_async] +// [START pubsub_v1_generated_SchemaService_DeleteSchema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_deleteschema_async] +// [END pubsub_v1_generated_SchemaService_DeleteSchema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java index 04ee5a3078..b7e421a8a8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_deleteschema_sync] +// [START pubsub_v1_generated_SchemaService_DeleteSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSchemaRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_deleteschema_sync] +// [END pubsub_v1_generated_SchemaService_DeleteSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java index 600c71d0e5..af400a0849 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_deleteschema_schemaname_sync] +// [START pubsub_v1_generated_SchemaService_DeleteSchema_Schemaname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncDeleteSchemaSchemaname() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_deleteschema_schemaname_sync] +// [END pubsub_v1_generated_SchemaService_DeleteSchema_Schemaname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java index 59d1983e02..52af2a9a27 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_deleteschema_string_sync] +// [START pubsub_v1_generated_SchemaService_DeleteSchema_String_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncDeleteSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_deleteschema_string_sync] +// [END pubsub_v1_generated_SchemaService_DeleteSchema_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java index 89eee40dc0..17b5095bd3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getiampolicy_async] +// [START pubsub_v1_generated_SchemaService_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getiampolicy_async] +// [END pubsub_v1_generated_SchemaService_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java index a479793be6..9490015035 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getiampolicy_sync] +// [START pubsub_v1_generated_SchemaService_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getiampolicy_sync] +// [END pubsub_v1_generated_SchemaService_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java index 2d2e1fd522..6ffacc689a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getschema_async] +// [START pubsub_v1_generated_SchemaService_GetSchema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.GetSchemaRequest; @@ -48,4 +48,4 @@ public static void asyncGetSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getschema_async] +// [END pubsub_v1_generated_SchemaService_GetSchema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java index dfe599dae7..5daf4351de 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getschema_sync] +// [START pubsub_v1_generated_SchemaService_GetSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.GetSchemaRequest; import com.google.pubsub.v1.Schema; @@ -45,4 +45,4 @@ public static void syncGetSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getschema_sync] +// [END pubsub_v1_generated_SchemaService_GetSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java index 6f4c1ad2b2..c0a7730113 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getschema_schemaname_sync] +// [START pubsub_v1_generated_SchemaService_GetSchema_Schemaname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.Schema; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncGetSchemaSchemaname() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getschema_schemaname_sync] +// [END pubsub_v1_generated_SchemaService_GetSchema_Schemaname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java index 1033d3f4b1..bc666dbc1c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_getschema_string_sync] +// [START pubsub_v1_generated_SchemaService_GetSchema_String_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.Schema; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncGetSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_getschema_string_sync] +// [END pubsub_v1_generated_SchemaService_GetSchema_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java index db3e3f29dc..b32fd480b5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_listschemas_async] +// [START pubsub_v1_generated_SchemaService_ListSchemas_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ListSchemasRequest; @@ -52,4 +52,4 @@ public static void asyncListSchemas() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_listschemas_async] +// [END pubsub_v1_generated_SchemaService_ListSchemas_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java index 3b09948cd0..6076b5e966 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_listschemas_paged_async] +// [START pubsub_v1_generated_SchemaService_ListSchemas_Paged_async] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSchemasRequest; @@ -60,4 +60,4 @@ public static void asyncListSchemasPaged() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_listschemas_paged_async] +// [END pubsub_v1_generated_SchemaService_ListSchemas_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java index 944e349087..705545481f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_listschemas_sync] +// [START pubsub_v1_generated_SchemaService_ListSchemas_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ListSchemasRequest; import com.google.pubsub.v1.ProjectName; @@ -49,4 +49,4 @@ public static void syncListSchemas() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_listschemas_sync] +// [END pubsub_v1_generated_SchemaService_ListSchemas_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java index e763eab4fd..d8508321ea 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_listschemas_projectname_sync] +// [START pubsub_v1_generated_SchemaService_ListSchemas_Projectname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncListSchemasProjectname() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_listschemas_projectname_sync] +// [END pubsub_v1_generated_SchemaService_ListSchemas_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java index f7e84a3903..51ece993eb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_listschemas_string_sync] +// [START pubsub_v1_generated_SchemaService_ListSchemas_String_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncListSchemasString() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_listschemas_string_sync] +// [END pubsub_v1_generated_SchemaService_ListSchemas_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java index f0bc564208..2ed22cb875 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_setiampolicy_async] +// [START pubsub_v1_generated_SchemaService_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_setiampolicy_async] +// [END pubsub_v1_generated_SchemaService_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java index 8adab7bd36..e5bd624781 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_setiampolicy_sync] +// [START pubsub_v1_generated_SchemaService_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_setiampolicy_sync] +// [END pubsub_v1_generated_SchemaService_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java index 5811d23d1c..f90e406a06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_testiampermissions_async] +// [START pubsub_v1_generated_SchemaService_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_testiampermissions_async] +// [END pubsub_v1_generated_SchemaService_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java index da49c01d54..2cc276ac72 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_testiampermissions_sync] +// [START pubsub_v1_generated_SchemaService_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_testiampermissions_sync] +// [END pubsub_v1_generated_SchemaService_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java index 0697504355..9e14354d7b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validatemessage_async] +// [START pubsub_v1_generated_SchemaService_ValidateMessage_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.ByteString; @@ -51,4 +51,4 @@ public static void asyncValidateMessage() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validatemessage_async] +// [END pubsub_v1_generated_SchemaService_ValidateMessage_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java index 12068a1d54..639b29346b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validatemessage_sync] +// [START pubsub_v1_generated_SchemaService_ValidateMessage_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.ByteString; import com.google.pubsub.v1.Encoding; @@ -47,4 +47,4 @@ public static void syncValidateMessage() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validatemessage_sync] +// [END pubsub_v1_generated_SchemaService_ValidateMessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java index 492fcf0803..ff299bad22 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validateschema_async] +// [START pubsub_v1_generated_SchemaService_ValidateSchema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; @@ -49,4 +49,4 @@ public static void asyncValidateSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validateschema_async] +// [END pubsub_v1_generated_SchemaService_ValidateSchema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java index 0d2c0a78a3..4855420298 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validateschema_sync] +// [START pubsub_v1_generated_SchemaService_ValidateSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -45,4 +45,4 @@ public static void syncValidateSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validateschema_sync] +// [END pubsub_v1_generated_SchemaService_ValidateSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java index fb0ea01fed..02e4cd0c20 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validateschema_projectnameschema_sync] +// [START pubsub_v1_generated_SchemaService_ValidateSchema_ProjectnameSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncValidateSchemaProjectnameSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validateschema_projectnameschema_sync] +// [END pubsub_v1_generated_SchemaService_ValidateSchema_ProjectnameSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java index 2cca6e3130..0b99145866 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaserviceclient_validateschema_stringschema_sync] +// [START pubsub_v1_generated_SchemaService_ValidateSchema_StringSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncValidateSchemaStringSchema() throws Exception { } } } -// [END pubsub_v1_generated_schemaserviceclient_validateschema_stringschema_sync] +// [END pubsub_v1_generated_SchemaService_ValidateSchema_StringSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java index 91efa0a7a0..b19fdbf7fb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_schemaservicesettings_createschema_sync] +// [START pubsub_v1_generated_SchemaServiceSettings_CreateSchema_sync] import com.google.cloud.pubsub.v1.SchemaServiceSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateSchema() throws Exception { SchemaServiceSettings schemaServiceSettings = schemaServiceSettingsBuilder.build(); } } -// [END pubsub_v1_generated_schemaservicesettings_createschema_sync] +// [END pubsub_v1_generated_SchemaServiceSettings_CreateSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java index 659e6f2a4f..df62a5021b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_publisherstubsettings_createtopic_sync] +// [START pubsub_v1_generated_PublisherStubSettings_CreateTopic_sync] import com.google.cloud.pubsub.v1.stub.PublisherStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateTopic() throws Exception { PublisherStubSettings topicAdminSettings = topicAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_publisherstubsettings_createtopic_sync] +// [END pubsub_v1_generated_PublisherStubSettings_CreateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java index 9d6ccf77b1..5f9bbe406f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_schemaservicestubsettings_createschema_sync] +// [START pubsub_v1_generated_SchemaServiceStubSettings_CreateSchema_sync] import com.google.cloud.pubsub.v1.stub.SchemaServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSchema() throws Exception { SchemaServiceStubSettings schemaServiceSettings = schemaServiceSettingsBuilder.build(); } } -// [END pubsub_v1_generated_schemaservicestubsettings_createschema_sync] +// [END pubsub_v1_generated_SchemaServiceStubSettings_CreateSchema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java index be52f20f4f..ea4083396e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_subscriberstubsettings_createsubscription_sync] +// [START pubsub_v1_generated_SubscriberStubSettings_CreateSubscription_sync] import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSubscription() throws Exception { SubscriberStubSettings subscriptionAdminSettings = subscriptionAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_subscriberstubsettings_createsubscription_sync] +// [END pubsub_v1_generated_SubscriberStubSettings_CreateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java index 1b3c606625..29614b0859 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_async] +// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -48,4 +48,4 @@ public static void asyncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_async] +// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java index b906a3e82c..751dfb0d78 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.AcknowledgeRequest; @@ -45,4 +45,4 @@ public static void syncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java index 5aa2df865d..8cdc60b790 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_stringliststring_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeStringListstring() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_stringliststring_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java index 9c2dcf4927..c34aa36f1d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_subscriptionnameliststring_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeSubscriptionnameListstring() throws Exception } } } -// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_subscriptionnameliststring_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java index 3acdaf154e..9b5057e476 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_create_setcredentialsprovider_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_subscriptionadminclient_create_setcredentialsprovider_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java index 8e5d38436b..e23042c9c3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_create_setendpoint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_subscriptionadminclient_create_setendpoint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java index 4eb276cd65..6fbc541b5e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_async] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; @@ -51,4 +51,4 @@ public static void asyncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_async] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java index dc2bdd6504..29edfc51c5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -47,4 +47,4 @@ public static void syncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java index a3a11e309b..6946725a40 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamestring_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamestring_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java index 5d237c5280..8411049f9e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamesubscriptionname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameSubscriptionname() throws Excep } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamesubscriptionname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java index 6be73f743d..da5863331b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringstring_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringstring_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java index e3c5c25fca..339814cabe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringsubscriptionname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringsubscriptionname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java index f5c291a69b..7d51d4ea88 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_async] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; @@ -67,4 +67,4 @@ public static void asyncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_async] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java index cf9498af7e..6f9ec0df0f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.DeadLetterPolicy; @@ -63,4 +63,4 @@ public static void syncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java index 29689fa996..04f5007d19 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_stringstringpushconfigint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringStringPushconfigInt() throws Exce } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_stringstringpushconfigint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java index 8bb5df7f35..a67223a046 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_stringtopicnamepushconfigint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringTopicnamePushconfigInt() throws E } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_stringtopicnamepushconfigint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java index b88fb5fff0..574fe47706 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnamestringpushconfigint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionSubscriptionnameStringPushconfigInt() t } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnamestringpushconfigint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java index db965129bf..4aee56b88d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnametopicnamepushconfigint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -46,4 +46,4 @@ public static void syncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt( } } } -// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnametopicnamepushconfigint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java index feb62e0fbe..80b063f2d1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_async] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_async] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java index 82a245cc5e..dd52f69b52 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java index 4ca1c0bcc6..4932bb9f6f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_snapshotname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_snapshotname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java index b728a12ba8..eaf04e65ee 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java index 8a55c39faf..b5b5cd8dab 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_async] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_async] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java index 346e57f842..dad68bcb90 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSubscriptionRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java index 075f759ed7..4b93510039 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java index e66a3a93e2..cd58d7c94a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_subscriptionname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_subscriptionname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java index 0f9feb64d3..a4008113c5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getiampolicy_async] +// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getiampolicy_async] +// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java index bdb63a6ab6..5f5010cdf0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getiampolicy_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getiampolicy_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java index 5e95662956..b23e6c203a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_async] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; @@ -47,4 +47,4 @@ public static void asyncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_async] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java index bc865fa600..e6b917d600 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -43,4 +43,4 @@ public static void syncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java index e9fc164f91..9089e7a7eb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_snapshotname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_snapshotname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java index 7de3b85c4e..d0b1834191 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java index 9b1e63ebc0..5aa661cd09 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_async] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_async] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java index cbeabada4d..af814f76d2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; import com.google.pubsub.v1.Subscription; @@ -43,4 +43,4 @@ public static void syncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java index 3bd50b6001..96318e4fb6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java index 4923c9dcf8..9139aaea83 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_subscriptionname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_subscriptionname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java index ea951f4f41..4bdc239e58 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -51,4 +51,4 @@ public static void asyncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java index 28bc0d2083..3a2e369ced 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_paged_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -59,4 +59,4 @@ public static void asyncListSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_paged_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java index 261d05cfa8..6fa3525272 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java index bd4d286c6d..f17df582c9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_projectname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_projectname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java index 5b3cba3312..c5c71dcdb8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java index 8cc89c6856..c80178b90b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -51,4 +51,4 @@ public static void asyncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java index 8836db0ab2..5caf00064a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_paged_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -59,4 +59,4 @@ public static void asyncListSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_paged_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java index d7bb4f92fe..888b1baf12 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java index d36a99ac62..feec6ee394 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_projectname_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_projectname_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java index af1c8187dd..14e0d0a9e1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_string_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_string_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java index 7cbd8d2a6f..62c37591bb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -50,4 +50,4 @@ public static void asyncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java index 5be7ebb018..e606d1d958 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyAckDeadlineRequest; @@ -46,4 +46,4 @@ public static void syncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java index 7b40b2dbc2..9c80163831 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_stringliststringint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineStringListstringInt() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_stringliststringint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java index 208b31b256..0f6c75fb28 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_subscriptionnameliststringint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineSubscriptionnameListstringInt() throws E } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_subscriptionnameliststringint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java index 668ec61965..e4f4b494a9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_async] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -49,4 +49,4 @@ public static void asyncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_async] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java index 72f4e5369c..4b98fffbf3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyPushConfigRequest; @@ -45,4 +45,4 @@ public static void syncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java index ac730021be..9d10bea2aa 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_stringpushconfig_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigStringPushconfig() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_stringpushconfig_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java index de4a8dfbd9..a158e59cc0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_subscriptionnamepushconfig_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigSubscriptionnamePushconfig() throws Excep } } } -// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_subscriptionnamepushconfig_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java index c893d34fee..f947a915b5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_async] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; @@ -48,4 +48,4 @@ public static void asyncPull() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_async] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java index 6704f86359..c1a1079c5d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; import com.google.pubsub.v1.PullResponse; @@ -45,4 +45,4 @@ public static void syncPull() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java index 00f4ebb1d1..bf9f3708ef 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_stringbooleanint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullStringBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_stringbooleanint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java index e0c3a4f0e9..33f0db5f86 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_stringint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullStringInt() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_stringint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java index 04beea7b2c..48adb74d45 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnamebooleanint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullSubscriptionnameBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnamebooleanint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java index 853c300295..5062165713 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnameint_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullSubscriptionnameInt() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnameint_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java index d5443a89e1..55212dd97d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_seek_async] +// [START pubsub_v1_generated_SubscriptionAdmin_Seek_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; @@ -46,4 +46,4 @@ public static void asyncSeek() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_seek_async] +// [END pubsub_v1_generated_SubscriptionAdmin_Seek_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java index ce4818173c..70a99a9ef7 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_seek_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_Seek_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; import com.google.pubsub.v1.SeekResponse; @@ -43,4 +43,4 @@ public static void syncSeek() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_seek_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_Seek_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java index 577c1380ff..ac7cb04a37 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_setiampolicy_async] +// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_setiampolicy_async] +// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java index 7f0493ca7e..38453850c6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_setiampolicy_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_setiampolicy_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java index 977dca9e23..72baf12607 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_streamingpull_async] +// [START pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.StreamingPullRequest; @@ -57,4 +57,4 @@ public static void asyncStreamingPull() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_streamingpull_async] +// [END pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java index e23f707afd..8cd6983fa8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_testiampermissions_async] +// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_testiampermissions_async] +// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java index 12d3af92b3..b412b30fbb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_testiampermissions_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_testiampermissions_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java index d53c3e6002..36ce3fd425 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_updatesnapshot_async] +// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_updatesnapshot_async] +// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java index 07efdc75e4..742fd2aeb5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_updatesnapshot_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Snapshot; @@ -44,4 +44,4 @@ public static void syncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_updatesnapshot_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java index 61872dc63a..0d442b959b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_updatesubscription_async] +// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_updatesubscription_async] +// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java index ef29dce71a..c4ec8bfe5f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminclient_updatesubscription_sync] +// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Subscription; @@ -44,4 +44,4 @@ public static void syncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_subscriptionadminclient_updatesubscription_sync] +// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java index 9f7b49153c..4b8fc85b52 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_subscriptionadminsettings_createsubscription_sync] +// [START pubsub_v1_generated_SubscriptionAdminSettings_CreateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSubscription() throws Exception { SubscriptionAdminSettings subscriptionAdminSettings = subscriptionAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_subscriptionadminsettings_createsubscription_sync] +// [END pubsub_v1_generated_SubscriptionAdminSettings_CreateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java index 73b3852ce3..2689c5e644 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_create_setcredentialsprovider_sync] +// [START pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_topicadminclient_create_setcredentialsprovider_sync] +// [END pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java index d3010d7cdb..7a9873e2e1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_create_setendpoint_sync] +// [START pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_topicadminclient_create_setendpoint_sync] +// [END pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java index 9e392a2e53..d2e14dd073 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_createtopic_async] +// [START pubsub_v1_generated_TopicAdmin_CreateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; @@ -55,4 +55,4 @@ public static void asyncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_createtopic_async] +// [END pubsub_v1_generated_TopicAdmin_CreateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java index 0811718acb..40695121e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_createtopic_sync] +// [START pubsub_v1_generated_TopicAdmin_CreateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.MessageStoragePolicy; @@ -52,4 +52,4 @@ public static void syncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_createtopic_sync] +// [END pubsub_v1_generated_TopicAdmin_CreateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java index db218d5ab6..c7fbe1a507 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_createtopic_string_sync] +// [START pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_createtopic_string_sync] +// [END pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java index 40c1e72690..a87e0a41ba 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_createtopic_topicname_sync] +// [START pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_createtopic_topicname_sync] +// [END pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java index 4984ec56a2..54087a1a06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_deletetopic_async] +// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_deletetopic_async] +// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java index fa1ed996ea..66d3598075 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_deletetopic_sync] +// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteTopicRequest; @@ -43,4 +43,4 @@ public static void syncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_deletetopic_sync] +// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java index c4476880bb..54c2d3a70d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_deletetopic_string_sync] +// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_deletetopic_string_sync] +// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java index 3e06153b59..ecfd69242a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_deletetopic_topicname_sync] +// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_deletetopic_topicname_sync] +// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java index ea439643f6..570b9cba9c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_detachsubscription_async] +// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_detachsubscription_async] +// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java index 9921df6dc0..0078b627cc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_detachsubscription_sync] +// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -43,4 +43,4 @@ public static void syncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_detachsubscription_sync] +// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java index 6d374e2d12..ba611dabba 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_getiampolicy_async] +// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_getiampolicy_async] +// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java index 9a7b21f97b..469141c01e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_getiampolicy_sync] +// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_getiampolicy_sync] +// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java index a9c350d1a9..38812517c2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_gettopic_async] +// [START pubsub_v1_generated_TopicAdmin_GetTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; @@ -46,4 +46,4 @@ public static void asyncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_gettopic_async] +// [END pubsub_v1_generated_TopicAdmin_GetTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java index 417ff4bbee..a33abdc612 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_gettopic_sync] +// [START pubsub_v1_generated_TopicAdmin_GetTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.Topic; @@ -43,4 +43,4 @@ public static void syncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_gettopic_sync] +// [END pubsub_v1_generated_TopicAdmin_GetTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java index e18e0fd46d..8747bad91a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_gettopic_string_sync] +// [START pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_gettopic_string_sync] +// [END pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java index d5c014b004..e73310c483 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_gettopic_topicname_sync] +// [START pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_gettopic_topicname_sync] +// [END pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java index 204698edd8..20e95874a9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopics_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopics_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopics_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopics_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java index 674eb38ee0..cd76f71f61 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopics_paged_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicsPaged() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopics_paged_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java index c613ba487b..225852c905 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopics_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopics_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopics_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopics_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java index 85213f1674..8a77860953 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopics_projectname_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopics_projectname_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java index 6a8d893f07..7d5cef7204 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopics_string_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopics_string_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java index 9b862febb8..fe65e4f98c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java index 7d39cf98d3..b89916be96 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_paged_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_paged_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java index 4fe184cae8..dbf6f6c855 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java index 6c6ea28f01..b8fcb98460 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_string_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_string_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java index 835c9ba0f1..143193b422 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_topicname_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_topicname_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java index 684c18072e..d81e41eb1f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java index 056cacdc03..8e1e6e7443 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_paged_async] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_paged_async] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java index 5106175cdf..ddacb54ab2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java index 0f3a7de139..d3b44f61bb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_string_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_string_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java index c94024d9bd..0b7ba70458 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_topicname_sync] +// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_topicname_sync] +// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java index 0428022c89..7be4c1d4a6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_publish_async] +// [START pubsub_v1_generated_TopicAdmin_Publish_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; @@ -49,4 +49,4 @@ public static void asyncPublish() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_publish_async] +// [END pubsub_v1_generated_TopicAdmin_Publish_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java index 82abe2dcc5..159a94a8b0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_publish_sync] +// [START pubsub_v1_generated_TopicAdmin_Publish_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; import com.google.pubsub.v1.PublishResponse; @@ -46,4 +46,4 @@ public static void syncPublish() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_publish_sync] +// [END pubsub_v1_generated_TopicAdmin_Publish_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java index 304ed27e2d..0e293316b5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_publish_stringlistpubsubmessage_sync] +// [START pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishStringListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_publish_stringlistpubsubmessage_sync] +// [END pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java index 049d7bd628..3ee1c88f3f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_publish_topicnamelistpubsubmessage_sync] +// [START pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishTopicnameListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_publish_topicnamelistpubsubmessage_sync] +// [END pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java index 99d5635a28..a1e5d19d56 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_setiampolicy_async] +// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_setiampolicy_async] +// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java index e362c3811a..25a50f9d5a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_setiampolicy_sync] +// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_setiampolicy_sync] +// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java index 880ce9aa23..2c521262f6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_testiampermissions_async] +// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_testiampermissions_async] +// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java index de87ca7134..2dfa13eb66 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_testiampermissions_sync] +// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_testiampermissions_sync] +// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java index 4455b8f198..4a1dc41af9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_updatetopic_async] +// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; @@ -47,4 +47,4 @@ public static void asyncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_updatetopic_async] +// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java index 5ba8feede1..ea1839364c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminclient_updatetopic_sync] +// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Topic; @@ -44,4 +44,4 @@ public static void syncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_topicadminclient_updatetopic_sync] +// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java index 5e38346067..e716aca1df 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_topicadminsettings_createtopic_sync] +// [START pubsub_v1_generated_TopicAdminSettings_CreateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateTopic() throws Exception { TopicAdminSettings topicAdminSettings = topicAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_topicadminsettings_createtopic_sync] +// [END pubsub_v1_generated_TopicAdminSettings_CreateTopic_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java index 84b8b68262..97a5a48105 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_create_setcredentialsprovider_sync] +// [START redis_v1beta1_generated_CloudRedis_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CloudRedisSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings); } } -// [END redis_v1beta1_generated_cloudredisclient_create_setcredentialsprovider_sync] +// [END redis_v1beta1_generated_CloudRedis_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java index dc877d2084..91b14d3867 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_create_setendpoint_sync] +// [START redis_v1beta1_generated_CloudRedis_Create_SetEndpoint_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CloudRedisSettings; import com.google.cloud.redis.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings); } } -// [END redis_v1beta1_generated_cloudredisclient_create_setendpoint_sync] +// [END redis_v1beta1_generated_CloudRedis_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java index 96519758d6..6e439e0dce 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_createinstance_async] +// [START redis_v1beta1_generated_CloudRedis_CreateInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncCreateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_createinstance_async] +// [END redis_v1beta1_generated_CloudRedis_CreateInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java index 35fea74142..6399d91963 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_createinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_CreateInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; @@ -50,4 +50,4 @@ public static void asyncCreateInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_createinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_CreateInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java index ba5cd839a1..c5ddf37679 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_createinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_CreateInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -45,4 +45,4 @@ public static void syncCreateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_createinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_CreateInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java index 4a0d38a859..11313ca84b 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_createinstance_locationnamestringinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_CreateInstance_LocationnameStringInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncCreateInstanceLocationnameStringInstance() throws Excepti } } } -// [END redis_v1beta1_generated_cloudredisclient_createinstance_locationnamestringinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_CreateInstance_LocationnameStringInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java index e3af6e6083..9ee0ca14d4 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_createinstance_stringstringinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_CreateInstance_StringStringInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncCreateInstanceStringStringInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_createinstance_stringstringinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_CreateInstance_StringStringInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java index be1676aca8..de5db2b35a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_async] +// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_async] +// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java index d1eb442ee8..3ec5e853bf 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java index 33b0ebb99e..e1966e46ec 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; import com.google.cloud.redis.v1beta1.InstanceName; @@ -43,4 +43,4 @@ public static void syncDeleteInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java index 942b4b99e3..88e9c960dd 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync] +// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_Instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteInstanceInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync] +// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_Instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java index 64add1b20c..676a72f40e 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync] +// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_String_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteInstanceString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync] +// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_String_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java index dfef10de39..a708fea978 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_exportinstance_async] +// [START redis_v1beta1_generated_CloudRedis_ExportInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; @@ -47,4 +47,4 @@ public static void asyncExportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_exportinstance_async] +// [END redis_v1beta1_generated_CloudRedis_ExportInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java index 4eb0cd23e0..82df97b5f0 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_exportinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_ExportInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncExportInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_exportinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_ExportInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java index 0a6078e327..f67d16d01b 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_exportinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_ExportInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -44,4 +44,4 @@ public static void syncExportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_exportinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_ExportInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java index 1e3a19f42b..840fe4f0a4 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_exportinstance_stringoutputconfig_sync] +// [START redis_v1beta1_generated_CloudRedis_ExportInstance_StringOutputconfig_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.OutputConfig; @@ -40,4 +40,4 @@ public static void syncExportInstanceStringOutputconfig() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_exportinstance_stringoutputconfig_sync] +// [END redis_v1beta1_generated_CloudRedis_ExportInstance_StringOutputconfig_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java index a6cf421f48..9d5dad8db3 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_async] +// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncFailoverInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_async] +// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java index 05f0f05aec..03091e3767 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; @@ -48,4 +48,4 @@ public static void asyncFailoverInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java index f5c369f45f..9fd4f0823a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java similarity index 88% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java index 7fdd68b0a1..725f87aa07 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_InstancenameFailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr } } } -// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_InstancenameFailoverinstancerequestdataprotectionmode_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java similarity index 89% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java index 54d5a60b95..42404416ba 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_StringFailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti } } } -// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_StringFailoverinstancerequestdataprotectionmode_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java index a447cd39e7..50e7e345fe 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstance_async] +// [START redis_v1beta1_generated_CloudRedis_GetInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncGetInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstance_async] +// [END redis_v1beta1_generated_CloudRedis_GetInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java index 4bc00a7ab7..51a60582bd 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncGetInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java index e22472c887..06236cdee0 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstance_instancename_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstance_Instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstance_instancename_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstance_Instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java index 1d3b929808..884d4e2544 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstance_string_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstance_String_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstance_string_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstance_String_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java index 070ea20e4e..8b6d217ea1 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_async] +// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceAuthStringRequest; @@ -47,4 +47,4 @@ public static void asyncGetInstanceAuthString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_async] +// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java index 9bf0be720f..8e1750fb99 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceAuthStringRequest; import com.google.cloud.redis.v1beta1.InstanceAuthString; @@ -43,4 +43,4 @@ public static void syncGetInstanceAuthString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java index 51ccae536e..aba48b769d 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_instancename_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_Instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceAuthString; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceAuthStringInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_instancename_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_Instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java index 2099b73459..01ce1d2431 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_string_sync] +// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_String_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceAuthString; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceAuthStringString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_string_sync] +// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_String_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java index d35688f486..3f62233680 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_importinstance_async] +// [START redis_v1beta1_generated_CloudRedis_ImportInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; @@ -47,4 +47,4 @@ public static void asyncImportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_importinstance_async] +// [END redis_v1beta1_generated_CloudRedis_ImportInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java index da4076dc26..d42251d1ef 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_importinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_ImportInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncImportInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_importinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_ImportInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java index 91af8a59c5..f263e715d8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_importinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_ImportInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; import com.google.cloud.redis.v1beta1.InputConfig; @@ -44,4 +44,4 @@ public static void syncImportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_importinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_ImportInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java index 074dea83e1..ddea6e6e40 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_importinstance_stringinputconfig_sync] +// [START redis_v1beta1_generated_CloudRedis_ImportInstance_StringInputconfig_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InputConfig; import com.google.cloud.redis.v1beta1.Instance; @@ -40,4 +40,4 @@ public static void syncImportInstanceStringInputconfig() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_importinstance_stringinputconfig_sync] +// [END redis_v1beta1_generated_CloudRedis_ImportInstance_StringInputconfig_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java index 666111e35e..20c7f67e8f 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_listinstances_async] +// [START redis_v1beta1_generated_CloudRedis_ListInstances_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -51,4 +51,4 @@ public static void asyncListInstances() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_listinstances_async] +// [END redis_v1beta1_generated_CloudRedis_ListInstances_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java index b528de4cfa..d9bfef025a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_listinstances_paged_async] +// [START redis_v1beta1_generated_CloudRedis_ListInstances_Paged_async] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.ListInstancesRequest; @@ -58,4 +58,4 @@ public static void asyncListInstancesPaged() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_listinstances_paged_async] +// [END redis_v1beta1_generated_CloudRedis_ListInstances_Paged_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java index 8b44b76ab9..f1273b5344 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_listinstances_sync] +// [START redis_v1beta1_generated_CloudRedis_ListInstances_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.ListInstancesRequest; @@ -47,4 +47,4 @@ public static void syncListInstances() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_listinstances_sync] +// [END redis_v1beta1_generated_CloudRedis_ListInstances_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java index 074b04ba05..9298fb26d5 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_listinstances_locationname_sync] +// [START redis_v1beta1_generated_CloudRedis_ListInstances_Locationname_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncListInstancesLocationname() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_listinstances_locationname_sync] +// [END redis_v1beta1_generated_CloudRedis_ListInstances_Locationname_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java index 32a46245a8..1e7395077b 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_listinstances_string_sync] +// [START redis_v1beta1_generated_CloudRedis_ListInstances_String_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncListInstancesString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_listinstances_string_sync] +// [END redis_v1beta1_generated_CloudRedis_ListInstances_String_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java index 6afd7c602a..0cd397acca 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_async] +// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; @@ -49,4 +49,4 @@ public static void asyncRescheduleMaintenance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_async] +// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java index d37e56f918..d9b3ae2e1b 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -50,4 +50,4 @@ public static void asyncRescheduleMaintenanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java index 8b8238870a..5b97aea2e8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_sync] +// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -45,4 +45,4 @@ public static void syncRescheduleMaintenance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_sync] +// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java similarity index 88% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java index 3cb0db55f3..b0291cf630 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_InstancenameReschedulemaintenancerequestrescheduletypeTimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -48,4 +48,4 @@ public static void main(String[] args) throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_InstancenameReschedulemaintenancerequestrescheduletypeTimestamp_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java similarity index 89% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java index ec59dafbe3..c9f19c0ff2 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_StringReschedulemaintenancerequestrescheduletypeTimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -47,4 +47,4 @@ public static void main(String[] args) throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_StringReschedulemaintenancerequestrescheduletypeTimestamp_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java index 5e60c29ba8..bbfd0e043a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_updateinstance_async] +// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -48,4 +48,4 @@ public static void asyncUpdateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_updateinstance_async] +// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java index fcbc0ff763..342b132f9d 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_updateinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -49,4 +49,4 @@ public static void asyncUpdateInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_updateinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java index f1bea39c8f..8bb1c193fe 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_updateinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.UpdateInstanceRequest; @@ -44,4 +44,4 @@ public static void syncUpdateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_updateinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java index d400476d73..65d41c35ab 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_updateinstance_fieldmaskinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_FieldmaskInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.protobuf.FieldMask; @@ -40,4 +40,4 @@ public static void syncUpdateInstanceFieldmaskInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_updateinstance_fieldmaskinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_FieldmaskInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java index 9f91d32f63..64e797aed0 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_async] +// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; @@ -47,4 +47,4 @@ public static void asyncUpgradeInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_async] +// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java index 9837b00214..9db9a43a4f 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_lro_async] +// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_LRO_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -49,4 +49,4 @@ public static void asyncUpgradeInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_lro_async] +// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_LRO_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java index 54ad26057c..64108a66fc 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_sync] +// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -44,4 +44,4 @@ public static void syncUpgradeInstance() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_sync] +// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java index b2249259df..6026622393 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_instancenamestring_sync] +// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_InstancenameString_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -40,4 +40,4 @@ public static void syncUpgradeInstanceInstancenameString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_instancenamestring_sync] +// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_InstancenameString_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java index 4dfc6e9b85..2081697271 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_stringstring_sync] +// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_StringString_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -40,4 +40,4 @@ public static void syncUpgradeInstanceStringString() throws Exception { } } } -// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_stringstring_sync] +// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_StringString_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java index 09bc7209e5..e8fb16fa8a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_cloudredissettings_getinstance_sync] +// [START redis_v1beta1_generated_CloudRedisSettings_GetInstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetInstance() throws Exception { CloudRedisSettings cloudRedisSettings = cloudRedisSettingsBuilder.build(); } } -// [END redis_v1beta1_generated_cloudredissettings_getinstance_sync] +// [END redis_v1beta1_generated_CloudRedisSettings_GetInstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java index 4e3bd14b06..364e543a79 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.stub.samples; -// [START redis_v1beta1_generated_cloudredisstubsettings_getinstance_sync] +// [START redis_v1beta1_generated_CloudRedisStubSettings_GetInstance_sync] import com.google.cloud.redis.v1beta1.stub.CloudRedisStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetInstance() throws Exception { CloudRedisStubSettings cloudRedisSettings = cloudRedisSettingsBuilder.build(); } } -// [END redis_v1beta1_generated_cloudredisstubsettings_getinstance_sync] +// [END redis_v1beta1_generated_CloudRedisStubSettings_GetInstance_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java index 600ff7ed69..0e7d8f5b05 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_composeobject_async] +// [START storage_v2_generated_Storage_ComposeObject_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -59,4 +59,4 @@ public static void asyncComposeObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_composeobject_async] +// [END storage_v2_generated_Storage_ComposeObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java index 981389805d..3ae9348e7b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_composeobject_sync] +// [START storage_v2_generated_Storage_ComposeObject_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.ComposeObjectRequest; @@ -56,4 +56,4 @@ public static void syncComposeObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_composeobject_sync] +// [END storage_v2_generated_Storage_ComposeObject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java index 85bff4fd73..c17ea693e1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_create_setcredentialsprovider_sync] +// [START storage_v2_generated_Storage_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.storage.v2.StorageClient; import com.google.storage.v2.StorageSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { StorageClient storageClient = StorageClient.create(storageSettings); } } -// [END storage_v2_generated_storageclient_create_setcredentialsprovider_sync] +// [END storage_v2_generated_Storage_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java index c25efcc648..b43c1b1baa 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_create_setendpoint_sync] +// [START storage_v2_generated_Storage_Create_SetEndpoint_sync] import com.google.storage.v2.StorageClient; import com.google.storage.v2.StorageSettings; import com.google.storage.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { StorageClient storageClient = StorageClient.create(storageSettings); } } -// [END storage_v2_generated_storageclient_create_setendpoint_sync] +// [END storage_v2_generated_Storage_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java index bdce3c935b..6ffaca8866 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createbucket_async] +// [START storage_v2_generated_Storage_CreateBucket_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.Bucket; import com.google.storage.v2.CreateBucketRequest; @@ -52,4 +52,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_createbucket_async] +// [END storage_v2_generated_Storage_CreateBucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java index 933718403f..5978d8d46e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createbucket_sync] +// [START storage_v2_generated_Storage_CreateBucket_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.CreateBucketRequest; import com.google.storage.v2.PredefinedBucketAcl; @@ -49,4 +49,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_createbucket_sync] +// [END storage_v2_generated_Storage_CreateBucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java index 40af1d09c1..38fba8446b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createbucket_projectnamebucketstring_sync] +// [START storage_v2_generated_Storage_CreateBucket_ProjectnameBucketString_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncCreateBucketProjectnameBucketString() throws Exception { } } } -// [END storage_v2_generated_storageclient_createbucket_projectnamebucketstring_sync] +// [END storage_v2_generated_Storage_CreateBucket_ProjectnameBucketString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java index 347bcd2613..7c6327688c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createbucket_stringbucketstring_sync] +// [START storage_v2_generated_Storage_CreateBucket_StringBucketString_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncCreateBucketStringBucketString() throws Exception { } } } -// [END storage_v2_generated_storageclient_createbucket_stringbucketstring_sync] +// [END storage_v2_generated_Storage_CreateBucket_StringBucketString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java index a309a09f9c..82e3900e95 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createhmackey_async] +// [START storage_v2_generated_Storage_CreateHmacKey_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.CreateHmacKeyRequest; @@ -50,4 +50,4 @@ public static void asyncCreateHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_createhmackey_async] +// [END storage_v2_generated_Storage_CreateHmacKey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java index 1fc92bad1b..6a77091f33 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createhmackey_sync] +// [START storage_v2_generated_Storage_CreateHmacKey_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.CreateHmacKeyRequest; import com.google.storage.v2.CreateHmacKeyResponse; @@ -46,4 +46,4 @@ public static void syncCreateHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_createhmackey_sync] +// [END storage_v2_generated_Storage_CreateHmacKey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java index f5ec47da68..fc3577f1aa 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createhmackey_projectnamestring_sync] +// [START storage_v2_generated_Storage_CreateHmacKey_ProjectnameString_sync] import com.google.storage.v2.CreateHmacKeyResponse; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateHmacKeyProjectnameString() throws Exception { } } } -// [END storage_v2_generated_storageclient_createhmackey_projectnamestring_sync] +// [END storage_v2_generated_Storage_CreateHmacKey_ProjectnameString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java index dc0ad3ab2b..9223e5e485 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createhmackey_stringstring_sync] +// [START storage_v2_generated_Storage_CreateHmacKey_StringString_sync] import com.google.storage.v2.CreateHmacKeyResponse; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_storageclient_createhmackey_stringstring_sync] +// [END storage_v2_generated_Storage_CreateHmacKey_StringString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java index fdaee0a18f..6155ee24d4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createnotification_async] +// [START storage_v2_generated_Storage_CreateNotification_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CreateNotificationRequest; import com.google.storage.v2.Notification; @@ -48,4 +48,4 @@ public static void asyncCreateNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_createnotification_async] +// [END storage_v2_generated_Storage_CreateNotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java index e184870aee..f48aec3a56 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createnotification_sync] +// [START storage_v2_generated_Storage_CreateNotification_sync] import com.google.storage.v2.CreateNotificationRequest; import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; @@ -44,4 +44,4 @@ public static void syncCreateNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_createnotification_sync] +// [END storage_v2_generated_Storage_CreateNotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java index 18b1de9bc4..bacc5f080b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createnotification_projectnamenotification_sync] +// [START storage_v2_generated_Storage_CreateNotification_ProjectnameNotification_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateNotificationProjectnameNotification() throws Except } } } -// [END storage_v2_generated_storageclient_createnotification_projectnamenotification_sync] +// [END storage_v2_generated_Storage_CreateNotification_ProjectnameNotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java index d46baddb9e..8958897191 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_createnotification_stringnotification_sync] +// [START storage_v2_generated_Storage_CreateNotification_StringNotification_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateNotificationStringNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_createnotification_stringnotification_sync] +// [END storage_v2_generated_Storage_CreateNotification_StringNotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java index dffde3bea3..383879beda 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletebucket_async] +// [START storage_v2_generated_Storage_DeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; @@ -50,4 +50,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletebucket_async] +// [END storage_v2_generated_Storage_DeleteBucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java index 0ba562f105..9f273a03b6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletebucket_sync] +// [START storage_v2_generated_Storage_DeleteBucket_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonRequestParams; @@ -47,4 +47,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletebucket_sync] +// [END storage_v2_generated_Storage_DeleteBucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java index df4a03d236..058b3ba4e2 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletebucket_bucketname_sync] +// [START storage_v2_generated_Storage_DeleteBucket_Bucketname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteBucketBucketname() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletebucket_bucketname_sync] +// [END storage_v2_generated_Storage_DeleteBucket_Bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java index 2da6d7f5e1..5f2ad3506c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletebucket_string_sync] +// [START storage_v2_generated_Storage_DeleteBucket_String_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteBucketString() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletebucket_string_sync] +// [END storage_v2_generated_Storage_DeleteBucket_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java index 76bc4d96ca..4d5371ce77 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletehmackey_async] +// [START storage_v2_generated_Storage_DeleteHmacKey_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.CommonRequestParams; @@ -49,4 +49,4 @@ public static void asyncDeleteHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletehmackey_async] +// [END storage_v2_generated_Storage_DeleteHmacKey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java index 7963ea332d..4c4987aae3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletehmackey_sync] +// [START storage_v2_generated_Storage_DeleteHmacKey_sync] import com.google.protobuf.Empty; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.DeleteHmacKeyRequest; @@ -46,4 +46,4 @@ public static void syncDeleteHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletehmackey_sync] +// [END storage_v2_generated_Storage_DeleteHmacKey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java index 94737c7400..8268243bb2 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletehmackey_stringprojectname_sync] +// [START storage_v2_generated_Storage_DeleteHmacKey_StringProjectname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteHmacKeyStringProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletehmackey_stringprojectname_sync] +// [END storage_v2_generated_Storage_DeleteHmacKey_StringProjectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java index af28259644..0c80aa1abd 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletehmackey_stringstring_sync] +// [START storage_v2_generated_Storage_DeleteHmacKey_StringString_sync] import com.google.protobuf.Empty; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletehmackey_stringstring_sync] +// [END storage_v2_generated_Storage_DeleteHmacKey_StringString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java index 9750969abe..13375c27c8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletenotification_async] +// [START storage_v2_generated_Storage_DeleteNotification_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.DeleteNotificationRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletenotification_async] +// [END storage_v2_generated_Storage_DeleteNotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java index 61711276a6..eb16ccf746 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletenotification_sync] +// [START storage_v2_generated_Storage_DeleteNotification_sync] import com.google.protobuf.Empty; import com.google.storage.v2.DeleteNotificationRequest; import com.google.storage.v2.NotificationName; @@ -43,4 +43,4 @@ public static void syncDeleteNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletenotification_sync] +// [END storage_v2_generated_Storage_DeleteNotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java index 997e2a981a..2066a7f99b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletenotification_notificationname_sync] +// [START storage_v2_generated_Storage_DeleteNotification_Notificationname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.NotificationName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteNotificationNotificationname() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletenotification_notificationname_sync] +// [END storage_v2_generated_Storage_DeleteNotification_Notificationname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java index fb4a6eb0f2..fdae07c684 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deletenotification_string_sync] +// [START storage_v2_generated_Storage_DeleteNotification_String_sync] import com.google.protobuf.Empty; import com.google.storage.v2.NotificationName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteNotificationString() throws Exception { } } } -// [END storage_v2_generated_storageclient_deletenotification_string_sync] +// [END storage_v2_generated_Storage_DeleteNotification_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java index 7a2be04630..714cd0468b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deleteobject_async] +// [START storage_v2_generated_Storage_DeleteObject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.CommonObjectRequestParams; @@ -56,4 +56,4 @@ public static void asyncDeleteObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_deleteobject_async] +// [END storage_v2_generated_Storage_DeleteObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java index 7a75b1b37f..2256af68a9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deleteobject_sync] +// [START storage_v2_generated_Storage_DeleteObject_sync] import com.google.protobuf.Empty; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -53,4 +53,4 @@ public static void syncDeleteObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_deleteobject_sync] +// [END storage_v2_generated_Storage_DeleteObject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java index 71bd69ab79..17f92a5fb8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deleteobject_stringstring_sync] +// [START storage_v2_generated_Storage_DeleteObject_StringString_sync] import com.google.protobuf.Empty; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteObjectStringString() throws Exception { } } } -// [END storage_v2_generated_storageclient_deleteobject_stringstring_sync] +// [END storage_v2_generated_Storage_DeleteObject_StringString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java index 95901e4bff..96ece21926 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_deleteobject_stringstringlong_sync] +// [START storage_v2_generated_Storage_DeleteObject_StringStringLong_sync] import com.google.protobuf.Empty; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteObjectStringStringLong() throws Exception { } } } -// [END storage_v2_generated_storageclient_deleteobject_stringstringlong_sync] +// [END storage_v2_generated_Storage_DeleteObject_StringStringLong_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java index 4ffc9d602a..3dcdced845 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getbucket_async] +// [START storage_v2_generated_Storage_GetBucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -52,4 +52,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_getbucket_async] +// [END storage_v2_generated_Storage_GetBucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java index 7041a17529..7f538febb9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getbucket_sync] +// [START storage_v2_generated_Storage_GetBucket_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; @@ -49,4 +49,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_getbucket_sync] +// [END storage_v2_generated_Storage_GetBucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java index 423ab72d7b..4380dde62d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getbucket_bucketname_sync] +// [START storage_v2_generated_Storage_GetBucket_Bucketname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetBucketBucketname() throws Exception { } } } -// [END storage_v2_generated_storageclient_getbucket_bucketname_sync] +// [END storage_v2_generated_Storage_GetBucket_Bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java index 8c45b96b53..b405ab5bf8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getbucket_string_sync] +// [START storage_v2_generated_Storage_GetBucket_String_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetBucketString() throws Exception { } } } -// [END storage_v2_generated_storageclient_getbucket_string_sync] +// [END storage_v2_generated_Storage_GetBucket_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java index 496208daa2..6296790f3a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_gethmackey_async] +// [START storage_v2_generated_Storage_GetHmacKey_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetHmacKeyRequest; @@ -49,4 +49,4 @@ public static void asyncGetHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_gethmackey_async] +// [END storage_v2_generated_Storage_GetHmacKey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java index 279f0db52c..3e10b16928 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_gethmackey_sync] +// [START storage_v2_generated_Storage_GetHmacKey_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetHmacKeyRequest; import com.google.storage.v2.HmacKeyMetadata; @@ -46,4 +46,4 @@ public static void syncGetHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_gethmackey_sync] +// [END storage_v2_generated_Storage_GetHmacKey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java index b301e0005a..1f9a3af72e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_gethmackey_stringprojectname_sync] +// [START storage_v2_generated_Storage_GetHmacKey_StringProjectname_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetHmacKeyStringProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_gethmackey_stringprojectname_sync] +// [END storage_v2_generated_Storage_GetHmacKey_StringProjectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java index a83efed1ad..2d474fe1f7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_gethmackey_stringstring_sync] +// [START storage_v2_generated_Storage_GetHmacKey_StringString_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_storageclient_gethmackey_stringstring_sync] +// [END storage_v2_generated_Storage_GetHmacKey_StringString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java index 9ffab60de8..3ad40f83e0 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getiampolicy_async] +// [START storage_v2_generated_Storage_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -50,4 +50,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_getiampolicy_async] +// [END storage_v2_generated_Storage_GetIamPolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java index f6ef5b73fa..8afb23d68d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getiampolicy_sync] +// [START storage_v2_generated_Storage_GetIamPolicy_sync] import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_getiampolicy_sync] +// [END storage_v2_generated_Storage_GetIamPolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java index d8c2afdd95..7957b007f7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getiampolicy_resourcename_sync] +// [START storage_v2_generated_Storage_GetIamPolicy_Resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; @@ -41,4 +41,4 @@ public static void syncGetIamPolicyResourcename() throws Exception { } } } -// [END storage_v2_generated_storageclient_getiampolicy_resourcename_sync] +// [END storage_v2_generated_Storage_GetIamPolicy_Resourcename_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java index df87a09e17..abf33118f1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getiampolicy_string_sync] +// [START storage_v2_generated_Storage_GetIamPolicy_String_sync] import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetIamPolicyString() throws Exception { } } } -// [END storage_v2_generated_storageclient_getiampolicy_string_sync] +// [END storage_v2_generated_Storage_GetIamPolicy_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java index f836ad97b6..e435ab17d9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getnotification_async] +// [START storage_v2_generated_Storage_GetNotification_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.BucketName; import com.google.storage.v2.GetNotificationRequest; @@ -46,4 +46,4 @@ public static void asyncGetNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_getnotification_async] +// [END storage_v2_generated_Storage_GetNotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java index 68baa46722..cf7daa57e1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getnotification_sync] +// [START storage_v2_generated_Storage_GetNotification_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.GetNotificationRequest; import com.google.storage.v2.Notification; @@ -43,4 +43,4 @@ public static void syncGetNotification() throws Exception { } } } -// [END storage_v2_generated_storageclient_getnotification_sync] +// [END storage_v2_generated_Storage_GetNotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java index 836c0fb469..c02279bd04 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getnotification_bucketname_sync] +// [START storage_v2_generated_Storage_GetNotification_Bucketname_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.Notification; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetNotificationBucketname() throws Exception { } } } -// [END storage_v2_generated_storageclient_getnotification_bucketname_sync] +// [END storage_v2_generated_Storage_GetNotification_Bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java index d7bbf4beb9..c986a36bd9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getnotification_string_sync] +// [START storage_v2_generated_Storage_GetNotification_String_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.Notification; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetNotificationString() throws Exception { } } } -// [END storage_v2_generated_storageclient_getnotification_string_sync] +// [END storage_v2_generated_Storage_GetNotification_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java index bb46a24b2e..7c9ec69f23 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getobject_async] +// [START storage_v2_generated_Storage_GetObject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -57,4 +57,4 @@ public static void asyncGetObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_getobject_async] +// [END storage_v2_generated_Storage_GetObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java index ef07fe163d..2df38b0411 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getobject_sync] +// [START storage_v2_generated_Storage_GetObject_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -54,4 +54,4 @@ public static void syncGetObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_getobject_sync] +// [END storage_v2_generated_Storage_GetObject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java index fd0bbefc1e..055976559c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getobject_stringstring_sync] +// [START storage_v2_generated_Storage_GetObject_StringString_sync] import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetObjectStringString() throws Exception { } } } -// [END storage_v2_generated_storageclient_getobject_stringstring_sync] +// [END storage_v2_generated_Storage_GetObject_StringString_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java index 815106ef57..d1b7872f9f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getobject_stringstringlong_sync] +// [START storage_v2_generated_Storage_GetObject_StringStringLong_sync] import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetObjectStringStringLong() throws Exception { } } } -// [END storage_v2_generated_storageclient_getobject_stringstringlong_sync] +// [END storage_v2_generated_Storage_GetObject_StringStringLong_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java index f582fbccbf..5a7bc7f5bd 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getserviceaccount_async] +// [START storage_v2_generated_Storage_GetServiceAccount_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetServiceAccountRequest; @@ -49,4 +49,4 @@ public static void asyncGetServiceAccount() throws Exception { } } } -// [END storage_v2_generated_storageclient_getserviceaccount_async] +// [END storage_v2_generated_Storage_GetServiceAccount_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java index 0460911b38..ac6aa64809 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getserviceaccount_sync] +// [START storage_v2_generated_Storage_GetServiceAccount_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetServiceAccountRequest; import com.google.storage.v2.ProjectName; @@ -45,4 +45,4 @@ public static void syncGetServiceAccount() throws Exception { } } } -// [END storage_v2_generated_storageclient_getserviceaccount_sync] +// [END storage_v2_generated_Storage_GetServiceAccount_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java index 55c604cec5..9c73fbfd80 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getserviceaccount_projectname_sync] +// [START storage_v2_generated_Storage_GetServiceAccount_Projectname_sync] import com.google.storage.v2.ProjectName; import com.google.storage.v2.ServiceAccount; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetServiceAccountProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_getserviceaccount_projectname_sync] +// [END storage_v2_generated_Storage_GetServiceAccount_Projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java index 41643f50af..366ed9739e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_getserviceaccount_string_sync] +// [START storage_v2_generated_Storage_GetServiceAccount_String_sync] import com.google.storage.v2.ProjectName; import com.google.storage.v2.ServiceAccount; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetServiceAccountString() throws Exception { } } } -// [END storage_v2_generated_storageclient_getserviceaccount_string_sync] +// [END storage_v2_generated_Storage_GetServiceAccount_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java index d04519c59b..ee836eb681 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listbuckets_async] +// [START storage_v2_generated_Storage_ListBuckets_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -55,4 +55,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END storage_v2_generated_storageclient_listbuckets_async] +// [END storage_v2_generated_Storage_ListBuckets_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java index adf9444d2d..50804dc510 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listbuckets_paged_async] +// [START storage_v2_generated_Storage_ListBuckets_Paged_async] import com.google.common.base.Strings; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -63,4 +63,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END storage_v2_generated_storageclient_listbuckets_paged_async] +// [END storage_v2_generated_Storage_ListBuckets_Paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java index 53c374d5d3..e8a5825092 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listbuckets_sync] +// [START storage_v2_generated_Storage_ListBuckets_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.CommonRequestParams; @@ -52,4 +52,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END storage_v2_generated_storageclient_listbuckets_sync] +// [END storage_v2_generated_Storage_ListBuckets_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java index 603a1b7d05..e9c9424c1a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listbuckets_projectname_sync] +// [START storage_v2_generated_Storage_ListBuckets_Projectname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListBucketsProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_listbuckets_projectname_sync] +// [END storage_v2_generated_Storage_ListBuckets_Projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java index e9aca45a50..630f6bc297 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listbuckets_string_sync] +// [START storage_v2_generated_Storage_ListBuckets_String_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END storage_v2_generated_storageclient_listbuckets_string_sync] +// [END storage_v2_generated_Storage_ListBuckets_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java index 2880515eb3..93a5d2848d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listhmackeys_async] +// [START storage_v2_generated_Storage_ListHmacKeys_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -55,4 +55,4 @@ public static void asyncListHmacKeys() throws Exception { } } } -// [END storage_v2_generated_storageclient_listhmackeys_async] +// [END storage_v2_generated_Storage_ListHmacKeys_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java index e65983b0e4..4ab0838fb2 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listhmackeys_paged_async] +// [START storage_v2_generated_Storage_ListHmacKeys_Paged_async] import com.google.common.base.Strings; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -62,4 +62,4 @@ public static void asyncListHmacKeysPaged() throws Exception { } } } -// [END storage_v2_generated_storageclient_listhmackeys_paged_async] +// [END storage_v2_generated_Storage_ListHmacKeys_Paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java index 9eaf07bc4e..aa3911a12e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listhmackeys_sync] +// [START storage_v2_generated_Storage_ListHmacKeys_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ListHmacKeysRequest; @@ -51,4 +51,4 @@ public static void syncListHmacKeys() throws Exception { } } } -// [END storage_v2_generated_storageclient_listhmackeys_sync] +// [END storage_v2_generated_Storage_ListHmacKeys_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java index 672f339b41..4a4791ca22 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listhmackeys_projectname_sync] +// [START storage_v2_generated_Storage_ListHmacKeys_Projectname_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListHmacKeysProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_listhmackeys_projectname_sync] +// [END storage_v2_generated_Storage_ListHmacKeys_Projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java index a5852cea5b..cc45b359b6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listhmackeys_string_sync] +// [START storage_v2_generated_Storage_ListHmacKeys_String_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListHmacKeysString() throws Exception { } } } -// [END storage_v2_generated_storageclient_listhmackeys_string_sync] +// [END storage_v2_generated_Storage_ListHmacKeys_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java index a3e87303b1..24f3399182 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listnotifications_async] +// [START storage_v2_generated_Storage_ListNotifications_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.Notification; @@ -51,4 +51,4 @@ public static void asyncListNotifications() throws Exception { } } } -// [END storage_v2_generated_storageclient_listnotifications_async] +// [END storage_v2_generated_Storage_ListNotifications_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java index b7db1c172d..9f14a283b1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listnotifications_paged_async] +// [START storage_v2_generated_Storage_ListNotifications_Paged_async] import com.google.common.base.Strings; import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.ListNotificationsResponse; @@ -59,4 +59,4 @@ public static void asyncListNotificationsPaged() throws Exception { } } } -// [END storage_v2_generated_storageclient_listnotifications_paged_async] +// [END storage_v2_generated_Storage_ListNotifications_Paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java index 65dabd0edb..0ccd2eb0d3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listnotifications_sync] +// [START storage_v2_generated_Storage_ListNotifications_sync] import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; @@ -47,4 +47,4 @@ public static void syncListNotifications() throws Exception { } } } -// [END storage_v2_generated_storageclient_listnotifications_sync] +// [END storage_v2_generated_Storage_ListNotifications_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java index 8b545ca5f4..d7ee513685 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listnotifications_projectname_sync] +// [START storage_v2_generated_Storage_ListNotifications_Projectname_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListNotificationsProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_listnotifications_projectname_sync] +// [END storage_v2_generated_Storage_ListNotifications_Projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java index 10dc0ca3fc..34898b1a5c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listnotifications_string_sync] +// [START storage_v2_generated_Storage_ListNotifications_String_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListNotificationsString() throws Exception { } } } -// [END storage_v2_generated_storageclient_listnotifications_string_sync] +// [END storage_v2_generated_Storage_ListNotifications_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java index 540d821a45..b3dc4aab67 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listobjects_async] +// [START storage_v2_generated_Storage_ListObjects_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -60,4 +60,4 @@ public static void asyncListObjects() throws Exception { } } } -// [END storage_v2_generated_storageclient_listobjects_async] +// [END storage_v2_generated_Storage_ListObjects_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java index 38ab63055e..52ec978572 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listobjects_paged_async] +// [START storage_v2_generated_Storage_ListObjects_Paged_async] import com.google.common.base.Strings; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -68,4 +68,4 @@ public static void asyncListObjectsPaged() throws Exception { } } } -// [END storage_v2_generated_storageclient_listobjects_paged_async] +// [END storage_v2_generated_Storage_ListObjects_Paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java index 52ee085997..0a7b1bf7c9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listobjects_sync] +// [START storage_v2_generated_Storage_ListObjects_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.ListObjectsRequest; @@ -57,4 +57,4 @@ public static void syncListObjects() throws Exception { } } } -// [END storage_v2_generated_storageclient_listobjects_sync] +// [END storage_v2_generated_Storage_ListObjects_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java index d58a09ddd8..ffeab2e800 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listobjects_projectname_sync] +// [START storage_v2_generated_Storage_ListObjects_Projectname_sync] import com.google.storage.v2.Object; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListObjectsProjectname() throws Exception { } } } -// [END storage_v2_generated_storageclient_listobjects_projectname_sync] +// [END storage_v2_generated_Storage_ListObjects_Projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java index eb5365e3db..07d0103f29 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_listobjects_string_sync] +// [START storage_v2_generated_Storage_ListObjects_String_sync] import com.google.storage.v2.Object; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListObjectsString() throws Exception { } } } -// [END storage_v2_generated_storageclient_listobjects_string_sync] +// [END storage_v2_generated_Storage_ListObjects_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java index 9e1629faf5..0a03174d88 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_async] +// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; @@ -50,4 +50,4 @@ public static void asyncLockBucketRetentionPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_async] +// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java index ef748a5b05..47cfec99e8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_sync] +// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonRequestParams; @@ -46,4 +46,4 @@ public static void syncLockBucketRetentionPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_sync] +// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java index 34a49422c7..975b421c1f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_bucketname_sync] +// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_Bucketname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncLockBucketRetentionPolicyBucketname() throws Exception { } } } -// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_bucketname_sync] +// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_Bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java index 2a3a6a6d20..9a368ae767 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_string_sync] +// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_String_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncLockBucketRetentionPolicyString() throws Exception { } } } -// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_string_sync] +// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java index 77d3793d69..920ed5636d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_querywritestatus_async] +// [START storage_v2_generated_Storage_QueryWriteStatus_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -50,4 +50,4 @@ public static void asyncQueryWriteStatus() throws Exception { } } } -// [END storage_v2_generated_storageclient_querywritestatus_async] +// [END storage_v2_generated_Storage_QueryWriteStatus_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java index 1e9a839858..c6ca964f02 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_querywritestatus_sync] +// [START storage_v2_generated_Storage_QueryWriteStatus_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.QueryWriteStatusRequest; @@ -46,4 +46,4 @@ public static void syncQueryWriteStatus() throws Exception { } } } -// [END storage_v2_generated_storageclient_querywritestatus_sync] +// [END storage_v2_generated_Storage_QueryWriteStatus_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java index 8e893433d6..edce608da6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_querywritestatus_string_sync] +// [START storage_v2_generated_Storage_QueryWriteStatus_String_sync] import com.google.storage.v2.QueryWriteStatusResponse; import com.google.storage.v2.StorageClient; @@ -38,4 +38,4 @@ public static void syncQueryWriteStatusString() throws Exception { } } } -// [END storage_v2_generated_storageclient_querywritestatus_string_sync] +// [END storage_v2_generated_Storage_QueryWriteStatus_String_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java index 2c973e42a9..9c514c72f7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_readobject_async] +// [START storage_v2_generated_Storage_ReadObject_async] import com.google.api.gax.rpc.ServerStream; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -60,4 +60,4 @@ public static void asyncReadObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_readobject_async] +// [END storage_v2_generated_Storage_ReadObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java similarity index 96% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java index 299e85e484..a85b895d7f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_rewriteobject_async] +// [START storage_v2_generated_Storage_RewriteObject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.ByteString; import com.google.storage.v2.BucketName; @@ -76,4 +76,4 @@ public static void asyncRewriteObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_rewriteobject_async] +// [END storage_v2_generated_Storage_RewriteObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java similarity index 96% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java index 18fb3abe11..b51f59f440 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_rewriteobject_sync] +// [START storage_v2_generated_Storage_RewriteObject_sync] import com.google.protobuf.ByteString; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonObjectRequestParams; @@ -73,4 +73,4 @@ public static void syncRewriteObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_rewriteobject_sync] +// [END storage_v2_generated_Storage_RewriteObject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java index fcfef46b4e..d4ee7afcc6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_setiampolicy_async] +// [START storage_v2_generated_Storage_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -49,4 +49,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_setiampolicy_async] +// [END storage_v2_generated_Storage_SetIamPolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java index 162a976b3a..83ce240bc6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_setiampolicy_sync] +// [START storage_v2_generated_Storage_SetIamPolicy_sync] import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; import com.google.storage.v2.CryptoKeyName; @@ -46,4 +46,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_setiampolicy_sync] +// [END storage_v2_generated_Storage_SetIamPolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java index eeb939ee73..b8c315d928 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_setiampolicy_resourcenamepolicy_sync] +// [START storage_v2_generated_Storage_SetIamPolicy_ResourcenamePolicy_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; @@ -42,4 +42,4 @@ public static void syncSetIamPolicyResourcenamePolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_setiampolicy_resourcenamepolicy_sync] +// [END storage_v2_generated_Storage_SetIamPolicy_ResourcenamePolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java index 7e952f016d..39e5e74725 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_setiampolicy_stringpolicy_sync] +// [START storage_v2_generated_Storage_SetIamPolicy_StringPolicy_sync] import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncSetIamPolicyStringPolicy() throws Exception { } } } -// [END storage_v2_generated_storageclient_setiampolicy_stringpolicy_sync] +// [END storage_v2_generated_Storage_SetIamPolicy_StringPolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java index 1fd68bad18..6475b7054e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_startresumablewrite_async] +// [START storage_v2_generated_Storage_StartResumableWrite_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -51,4 +51,4 @@ public static void asyncStartResumableWrite() throws Exception { } } } -// [END storage_v2_generated_storageclient_startresumablewrite_async] +// [END storage_v2_generated_Storage_StartResumableWrite_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java index e89e5828c4..3b707f8b52 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_startresumablewrite_sync] +// [START storage_v2_generated_Storage_StartResumableWrite_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.StartResumableWriteRequest; @@ -47,4 +47,4 @@ public static void syncStartResumableWrite() throws Exception { } } } -// [END storage_v2_generated_storageclient_startresumablewrite_sync] +// [END storage_v2_generated_Storage_StartResumableWrite_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java index 66726a9a22..c8eb1c9640 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_testiampermissions_async] +// [START storage_v2_generated_Storage_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -51,4 +51,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END storage_v2_generated_storageclient_testiampermissions_async] +// [END storage_v2_generated_Storage_TestIamPermissions_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java index f0b6301795..dae7ffbb49 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_testiampermissions_sync] +// [START storage_v2_generated_Storage_TestIamPermissions_sync] import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; @@ -47,4 +47,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END storage_v2_generated_storageclient_testiampermissions_sync] +// [END storage_v2_generated_Storage_TestIamPermissions_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java index 8e12e2e1b1..fe6593f2b1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_testiampermissions_resourcenameliststring_sync] +// [START storage_v2_generated_Storage_TestIamPermissions_ResourcenameListstring_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; @@ -44,4 +44,4 @@ public static void syncTestIamPermissionsResourcenameListstring() throws Excepti } } } -// [END storage_v2_generated_storageclient_testiampermissions_resourcenameliststring_sync] +// [END storage_v2_generated_Storage_TestIamPermissions_ResourcenameListstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java index b0c702d65d..607b2ed2a4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_testiampermissions_stringliststring_sync] +// [START storage_v2_generated_Storage_TestIamPermissions_StringListstring_sync] import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -43,4 +43,4 @@ public static void syncTestIamPermissionsStringListstring() throws Exception { } } } -// [END storage_v2_generated_storageclient_testiampermissions_stringliststring_sync] +// [END storage_v2_generated_Storage_TestIamPermissions_StringListstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java index 692e032a0c..0c093f5357 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatebucket_async] +// [START storage_v2_generated_Storage_UpdateBucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -55,4 +55,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_updatebucket_async] +// [END storage_v2_generated_Storage_UpdateBucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java index 2a4bf571f4..af6de69a6a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatebucket_sync] +// [START storage_v2_generated_Storage_UpdateBucket_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.CommonRequestParams; @@ -52,4 +52,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END storage_v2_generated_storageclient_updatebucket_sync] +// [END storage_v2_generated_Storage_UpdateBucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java index 6155dfd464..def1e336a3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatebucket_bucketfieldmask_sync] +// [START storage_v2_generated_Storage_UpdateBucket_BucketFieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateBucketBucketFieldmask() throws Exception { } } } -// [END storage_v2_generated_storageclient_updatebucket_bucketfieldmask_sync] +// [END storage_v2_generated_Storage_UpdateBucket_BucketFieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java index 4d6bc6bf21..e64d3b00af 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatehmackey_async] +// [START storage_v2_generated_Storage_UpdateHmacKey_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -49,4 +49,4 @@ public static void asyncUpdateHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_updatehmackey_async] +// [END storage_v2_generated_Storage_UpdateHmacKey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java index 348190181b..315cefd0cd 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatehmackey_sync] +// [START storage_v2_generated_Storage_UpdateHmacKey_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -46,4 +46,4 @@ public static void syncUpdateHmacKey() throws Exception { } } } -// [END storage_v2_generated_storageclient_updatehmackey_sync] +// [END storage_v2_generated_Storage_UpdateHmacKey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java index 8250c51372..188f04a358 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updatehmackey_hmackeymetadatafieldmask_sync] +// [START storage_v2_generated_Storage_UpdateHmacKey_HmackeymetadataFieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateHmacKeyHmackeymetadataFieldmask() throws Exception } } } -// [END storage_v2_generated_storageclient_updatehmackey_hmackeymetadatafieldmask_sync] +// [END storage_v2_generated_Storage_UpdateHmacKey_HmackeymetadataFieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java index 2d58d876e7..a91c083c6c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updateobject_async] +// [START storage_v2_generated_Storage_UpdateObject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -57,4 +57,4 @@ public static void asyncUpdateObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_updateobject_async] +// [END storage_v2_generated_Storage_UpdateObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java index e754240336..e5dbbf698a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updateobject_sync] +// [START storage_v2_generated_Storage_UpdateObject_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -54,4 +54,4 @@ public static void syncUpdateObject() throws Exception { } } } -// [END storage_v2_generated_storageclient_updateobject_sync] +// [END storage_v2_generated_Storage_UpdateObject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java index 7e6d83d11a..c33865a01e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_updateobject_objectfieldmask_sync] +// [START storage_v2_generated_Storage_UpdateObject_ObjectFieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateObjectObjectFieldmask() throws Exception { } } } -// [END storage_v2_generated_storageclient_updateobject_objectfieldmask_sync] +// [END storage_v2_generated_Storage_UpdateObject_ObjectFieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java index 8ef622a7ea..15ab73a6aa 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storageclient_writeobject_async] +// [START storage_v2_generated_Storage_WriteObject_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -69,4 +69,4 @@ public void onCompleted() { } } } -// [END storage_v2_generated_storageclient_writeobject_async] +// [END storage_v2_generated_Storage_WriteObject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java index 064574c4d5..22d518e905 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_storagesettings_deletebucket_sync] +// [START storage_v2_generated_StorageSettings_DeleteBucket_sync] import com.google.storage.v2.StorageSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { StorageSettings storageSettings = storageSettingsBuilder.build(); } } -// [END storage_v2_generated_storagesettings_deletebucket_sync] +// [END storage_v2_generated_StorageSettings_DeleteBucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java index 4ac8cb2ed7..73a1bc3c2b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.stub.samples; -// [START storage_v2_generated_storagestubsettings_deletebucket_sync] +// [START storage_v2_generated_StorageStubSettings_DeleteBucket_sync] import com.google.storage.v2.stub.StorageStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { StorageStubSettings storageSettings = storageSettingsBuilder.build(); } } -// [END storage_v2_generated_storagestubsettings_deletebucket_sync] +// [END storage_v2_generated_StorageStubSettings_DeleteBucket_sync] From aa1782da8730d961e92682665da50faad23b5c88 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 Oct 2022 17:17:46 +0200 Subject: [PATCH 058/103] fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 (#1063) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66021f43a7..273e03b2d5 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.4 + 3.0.5 pom import From e8ee82f0d61f8d798c46f962c5afe558dcf4f759 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:10:10 -0400 Subject: [PATCH 059/103] chore(main): release 2.10.2 (#1067) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ version.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4da28758a8..069098dbe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.10.2](https://github.com/googleapis/gapic-generator-java/compare/v2.10.1...v2.10.2) (2022-10-24) + + +### Bug Fixes + +* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 ([#1063](https://github.com/googleapis/gapic-generator-java/issues/1063)) ([80ed62c](https://github.com/googleapis/gapic-generator-java/commit/80ed62cf6aff395d150e394a44fb60da37e9a6ae)) +* Update regionTag to use service name ([#1047](https://github.com/googleapis/gapic-generator-java/issues/1047)) ([68b33c2](https://github.com/googleapis/gapic-generator-java/commit/68b33c23948ffe7a2bf6acd53731d786257f6bd1)) + ## [2.10.1](https://github.com/googleapis/gapic-generator-java/compare/v2.10.0...v2.10.1) (2022-10-20) diff --git a/version.txt b/version.txt index 8bbb6e406a..c6436a8536 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.10.1 +2.10.2 From 67742450039173681bf4e22f70f2bcbc20581261 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 29 Oct 2022 00:16:21 +0200 Subject: [PATCH 060/103] chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 273e03b2d5..76416d39da 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.0 + 3.4.1 package From 2ebe94874699fa99520ddbb3231c8c72821944df Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Mon, 31 Oct 2022 17:04:21 -0400 Subject: [PATCH 061/103] refactor: expose parsed api short name and version as fields in Service (#1075) * Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. * Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated) * This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process. --- .../generator/gapic/composer/Composer.java | 37 +-------- .../AbstractServiceClientClassComposer.java | 3 +- .../AbstractServiceSettingsClassComposer.java | 3 +- ...tractServiceStubSettingsClassComposer.java | 3 +- .../api/generator/gapic/model/GapicClass.java | 23 ++++-- .../api/generator/gapic/model/Service.java | 47 ++++++++++++ .../gapic/composer/ComposerTest.java | 74 ++++++++---------- .../grpc/ServiceClientClassComposerTest.java | 27 +++++-- .../ServiceSettingsClassComposerTest.java | 18 ++++- .../grpc/ServiceStubClassComposerTest.java | 12 ++- .../ServiceStubSettingsClassComposerTest.java | 22 ++++-- .../generator/gapic/model/ServiceTest.java | 75 +++++++++++++++++++ 12 files changed, 238 insertions(+), 106 deletions(-) create mode 100644 src/test/java/com/google/api/generator/gapic/model/ServiceTest.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 60d4f5dde2..acd914a163 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -37,8 +37,6 @@ import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.model.Transport; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -50,8 +48,7 @@ public static List composeServiceClasses(GapicContext context) { clazzes.addAll(generateServiceClasses(context)); clazzes.addAll(generateMockClasses(context, context.mixinServices())); clazzes.addAll(generateResourceNameHelperClasses(context)); - return addApacheLicense( - prepareExecutableSamples(clazzes, context.gapicMetadata().getProtoPackage())); + return addApacheLicense(prepareExecutableSamples(clazzes)); } public static GapicPackageInfo composePackageInfo(GapicContext context) { @@ -193,16 +190,7 @@ public static List generateTestClasses(GapicContext context) { } @VisibleForTesting - static List prepareExecutableSamples(List clazzes, String protoPackage) { - // parse protoPackage for apiVersion - String[] pakkage = protoPackage.split("\\."); - String apiVersion; - // e.g. v1, v2, v1beta1 - if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { - apiVersion = pakkage[pakkage.length - 1]; - } else { - apiVersion = ""; - } + static List prepareExecutableSamples(List clazzes) { // Include license header, apiShortName, and apiVersion List clazzesWithSamples = new ArrayList<>(); clazzes.forEach( @@ -214,31 +202,12 @@ static List prepareExecutableSamples(List clazzes, Strin sample -> samples.add( addRegionTagAndHeaderToSample( - sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion))); + sample, gapicClass.apiShortName(), gapicClass.apiVersion()))); clazzesWithSamples.add(gapicClass.withSamples(samples)); }); return clazzesWithSamples; } - // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default - // endpoints like - // "us-east1-pubsub.googleapis.com". - @VisibleForTesting - protected static String parseDefaultHost(String defaultHost) { - // If the defaultHost is of the format "**.googleapis.com", take the name before the first - // period. - String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); - // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the - // first period and after the last dash to follow CSharp's implementation here: - // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 - apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); - // `iam-meta-api` service is an exceptional case and is handled as a one-off - if (defaultHost.contains("iam-meta-api")) { - apiShortName = "iam"; - } - return apiShortName; - } - @VisibleForTesting protected static Sample addRegionTagAndHeaderToSample( Sample sample, String apiShortName, String apiVersion) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index c76f25c9f6..073023cfad 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -164,7 +164,8 @@ public GapicClass generate(GapicContext context, Service service) { updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames); return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } private static List createClassAnnotations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java index 08186862ae..fdfa33f471 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java @@ -127,7 +127,8 @@ public GapicClass generate(GapicContext context, Service service) { .setNestedClasses(Arrays.asList(createNestedBuilderClass(service, typeStore))) .build(); return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } private static List createClassHeaderComments( diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index cea124e96d..fe66a11e77 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -202,7 +202,8 @@ public GapicClass generate(GapicContext context, Service service) { .build(); return GapicClass.create( GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() { diff --git a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java index 165cb4d94b..f05e308290 100644 --- a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java +++ b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java @@ -35,9 +35,11 @@ public enum Kind { public abstract List samples(); - // Represents the host URL for the service. May or may not contain a regional endpoint. Only used - // for generating the region tag for samples; therefore only used in select Composers. - public abstract String defaultHost(); + // Only used for generating the region tag for samples; therefore only used in select Composers. + public abstract String apiShortName(); + + // Only used for generating the region tag for samples; therefore only used in select Composers. + public abstract String apiVersion(); public static GapicClass create(Kind kind, ClassDefinition classDefinition) { return builder().setKind(kind).setClassDefinition(classDefinition).build(); @@ -51,7 +53,8 @@ public static GapicClass create( static Builder builder() { return new AutoValue_GapicClass.Builder() .setSamples(Collections.emptyList()) - .setDefaultHost(""); + .setApiShortName("") + .setApiVersion(""); } abstract Builder toBuilder(); @@ -60,8 +63,12 @@ public final GapicClass withSamples(List samples) { return toBuilder().setSamples(samples).build(); } - public final GapicClass withDefaultHost(String defaultHost) { - return toBuilder().setDefaultHost(defaultHost).build(); + public final GapicClass withApiShortName(String apiShortName) { + return toBuilder().setApiShortName(apiShortName).build(); + } + + public final GapicClass withApiVersion(String apiVersion) { + return toBuilder().setApiVersion(apiVersion).build(); } @AutoValue.Builder @@ -72,7 +79,9 @@ abstract static class Builder { abstract Builder setSamples(List samples); - abstract Builder setDefaultHost(String defaultHost); + abstract Builder setApiShortName(String apiShortName); + + abstract Builder setApiVersion(String apiVersion); abstract GapicClass build(); } diff --git a/src/main/java/com/google/api/generator/gapic/model/Service.java b/src/main/java/com/google/api/generator/gapic/model/Service.java index 34d3f97b25..2e3a6be7df 100644 --- a/src/main/java/com/google/api/generator/gapic/model/Service.java +++ b/src/main/java/com/google/api/generator/gapic/model/Service.java @@ -16,8 +16,10 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.auto.value.AutoValue; +import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import java.util.List; import javax.annotation.Nullable; @@ -50,6 +52,20 @@ public boolean hasDescription() { return !Strings.isNullOrEmpty(description()); } + public String apiShortName() { + if (!Strings.isNullOrEmpty(defaultHost())) { + return parseApiShortName(defaultHost()); + } + return ""; + } + + public String apiVersion() { + if (!Strings.isNullOrEmpty(protoPakkage())) { + return parseApiVersion(protoPakkage()); + } + return ""; + } + public Method operationPollingMethod() { for (Method method : methods()) { if (method.isOperationPollingMethod()) { @@ -127,4 +143,35 @@ public abstract static class Builder { public abstract Service build(); } + + private static String parseApiVersion(String protoPackage) { + // parse protoPackage for apiVersion + String[] pakkage = protoPackage.split("\\."); + String apiVersion; + // e.g. v1, v2, v1beta1 + if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { + apiVersion = pakkage[pakkage.length - 1]; + } else { + apiVersion = ""; + } + return apiVersion; + } + + // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default + // endpoints like + // "us-east1-pubsub.googleapis.com". + private static String parseApiShortName(String defaultHost) { + // If the defaultHost is of the format "**.googleapis.com", take the name before the first + // period. + String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); + // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the + // first period and after the last dash to follow CSharp's implementation here: + // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 + apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); + // `iam-meta-api` service is an exceptional case and is handled as a one-off + if (defaultHost.contains("iam-meta-api")) { + apiShortName = "iam"; + } + return apiShortName; + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java index caf070682c..d99325fbe8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java @@ -42,14 +42,16 @@ public class ComposerTest { private final Service echoProtoService = context.services().get(0); private final List clazzes = Arrays.asList( - GrpcServiceCallableFactoryClassComposer.instance().generate(context, echoProtoService)); + GrpcServiceCallableFactoryClassComposer.instance() + .generate(context, echoProtoService) + .withApiShortName(echoProtoService.apiShortName()) + .withApiVersion(echoProtoService.apiVersion())); private final Sample sample = Sample.builder() .setRegionTag( RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build()) .build(); private List ListofSamples = Arrays.asList(new Sample[] {sample}); - private final String protoPackage = echoProtoService.protoPakkage(); @Test public void gapicClass_addApacheLicense() { @@ -75,7 +77,7 @@ public void composeSamples_showcase() { List testClassList = Arrays.asList(new GapicClass[] {testClass}); List composedSamples = - Composer.prepareExecutableSamples(testClassList, protoPackage).get(0).samples(); + Composer.prepareExecutableSamples(testClassList).get(0).samples(); assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { @@ -83,39 +85,14 @@ public void composeSamples_showcase() { "File header should be APACHE", Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), sample.fileHeader()); - assertEquals("ApiShortName should be empty", "", sample.regionTag().apiShortName()); - assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion()); + assertEquals( + "ApiShortName should be Localhost7469", + "Localhost7469", + sample.regionTag().apiShortName()); + assertEquals("ApiVersion should be V1Beta1", "V1Beta1", sample.regionTag().apiVersion()); } } - @Test - public void parseDefaultHost_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { - String defaultHost = "us-east1-pubsub.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("pubsub", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnApiShortName() { - String defaultHost = "logging.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("logging", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnApiShortNameForIam() { - String defaultHost = "iam-meta-api.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("iam", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnHostIfNoPeriods() { - String defaultHost = "logging:7469"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("logging:7469", apiShortName); - } - @Test public void gapicClass_addRegionTagAndHeaderToSample() { Sample testSample; @@ -129,12 +106,12 @@ public void gapicClass_addRegionTagAndHeaderToSample() { public void composeSamples_parseProtoPackage() { String defaultHost = "accessapproval.googleapis.com:443"; - GapicClass testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); - List testClassList = Arrays.asList(new GapicClass[] {testClass}); String protoPack = "google.cloud.accessapproval.v1"; - + Service testService = + echoProtoService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + List testClassList = getTestClassListFromService(testService); List composedSamples = - Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -149,9 +126,10 @@ public void composeSamples_parseProtoPackage() { protoPack = "google.cloud.vision.v1p1beta1"; defaultHost = "vision.googleapis.com"; - testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); - testClassList = Arrays.asList(new GapicClass[] {testClass}); - composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + testService = + testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + testClassList = getTestClassListFromService(testService); + composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -161,7 +139,10 @@ public void composeSamples_parseProtoPackage() { } protoPack = "google.cloud.vision"; - composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + testService = + testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + testClassList = getTestClassListFromService(testService); + composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -170,4 +151,15 @@ public void composeSamples_parseProtoPackage() { assertEquals("ApiVersion should be empty", sample.regionTag().apiVersion(), ""); } } + + private List getTestClassListFromService(Service testService) { + GapicClass testClass = + GrpcServiceCallableFactoryClassComposer.instance() + .generate(context, testService) + .withSamples(ListofSamples) + .withApiShortName(testService.apiShortName()) + .withApiVersion(testService.apiVersion()); + List testClassList = Arrays.asList(new GapicClass[] {testClass}); + return testClassList; + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java index 18450c1ca8..c169c88eb3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java @@ -29,26 +29,35 @@ public class ServiceClientClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoClient", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "EchoClient", + GrpcTestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" + }, { "DeprecatedServiceClient", GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" }, { "IdentityClient", GrpcTestProtoLoader.instance().parseShowcaseIdentity(), - "localhost:7469" + "localhost:7469", + "v1beta1" }, { "BookshopClient", GrpcTestProtoLoader.instance().parseBookshopService(), - "localhost:2665" + "localhost:2665", + "v1beta1" }, { "MessagingClient", GrpcTestProtoLoader.instance().parseShowcaseMessaging(), - "localhost:7469" + "localhost:7469", + "v1beta1" }, }); } @@ -59,7 +68,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceClientClasses() { @@ -69,6 +81,7 @@ public void generateServiceClientClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertGoldenSamples( this.getClass(), name, clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java index 7f59ac58d0..1d245a7490 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java @@ -31,11 +31,17 @@ public class ServiceSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoSettings", TestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "EchoSettings", + TestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" + }, { "DeprecatedServiceSettings", TestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" } }); } @@ -46,7 +52,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceSettingsClasses() { @@ -59,6 +68,7 @@ public void generateServiceSettingsClasses() { "servicesettings", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java index 0da8ac4548..730136c083 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java @@ -31,8 +31,8 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), ""}, - {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), ""} + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), "", ""}, + {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), "", ""} }); } @@ -42,7 +42,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceStubClasses() { @@ -51,6 +54,7 @@ public void generateServiceStubClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java index 019252dce3..747b19b8e0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java @@ -33,20 +33,26 @@ public static Collection data() { { "LoggingServiceV2StubSettings", GrpcTestProtoLoader.instance().parseLogging(), - "logging.googleapis.com:443" + "logging", + "v2" }, { "PublisherStubSettings", GrpcTestProtoLoader.instance().parsePubSubPublisher(), - "pubsub.googleapis.com:443" + "pubsub", + "v1" }, { - "EchoStubSettings", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469" + "EchoStubSettings", + GrpcTestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" }, { "DeprecatedServiceStubSettings", GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" } }); } @@ -57,7 +63,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceStubSettingsClasses() { @@ -70,6 +79,7 @@ public void generateServiceStubSettingsClasses() { "servicesettings/stub", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java b/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java new file mode 100644 index 0000000000..c6f60b831f --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java @@ -0,0 +1,75 @@ +// 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.model; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import org.junit.Test; + +public class ServiceTest { + private static final String SHOWCASE_PACKAGE_NAME = "com.google.showcase.v1beta1"; + private static final Service.Builder testServiceBuilder = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo"); + + @Test + public void apiShortName_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { + String defaultHost = "us-east1-pubsub.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("pubsub", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnApiShortName() { + String defaultHost = "logging.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("logging", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnApiShortNameForIam() { + String defaultHost = "iam-meta-api.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("iam", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnHostIfNoPeriods() { + String defaultHost = "logging:7469"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("logging:7469", testService.apiShortName()); + } + + @Test + public void apiVersion_shouldReturnVersionIfMatch() { + String protoPackage = "com.google.showcase.v1"; + Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); + assertEquals("v1", testService.apiVersion()); + } + + @Test + public void apiVersion_shouldReturnEmptyIfNoMatch() { + String protoPackage = "com.google.showcase"; + Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); + assertEquals("", testService.apiVersion()); + } +} From 5346eefb166b89ca96b22bf613eb902e16935eee Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:19:21 -0700 Subject: [PATCH 062/103] fix: fix REST transport client creation generated javadoc sample (#1077) --- .../grpcrest/ServiceClientClassComposer.java | 2 +- .../ServiceClientHeaderSampleComposer.java | 21 +++---------------- .../grpcrest/goldens/EchoClient.golden | 6 +----- .../grpcrest/goldens/EchoEmpty.golden | 6 +----- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index e600ada5d2..5eb48fa06a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -59,7 +59,7 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); Sample transportSampleCode = ServiceClientHeaderSampleComposer.composeTransportSample( - clientType, settingsType, "defaultHttpJsonTransportProviderBuilder"); + clientType, settingsType, "newHttpJsonBuilder"); samples.addAll( Arrays.asList( classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode)); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index 2c00498e4f..11f70bcb27 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -285,7 +285,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett } public static Sample composeTransportSample( - TypeNode clientType, TypeNode settingsType, String transportProviderMethod) { + TypeNode clientType, TypeNode settingsType, String transportBuilderMethod) { String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = @@ -294,26 +294,11 @@ public static Sample composeTransportSample( MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() .setStaticReferenceType(settingsType) - .setMethodName("newBuilder") - .build(); - MethodInvocationExpr transportChannelProviderArg = - MethodInvocationExpr.builder() - .setExprReferenceExpr( - MethodInvocationExpr.builder() - .setStaticReferenceType(settingsType) - .setMethodName(transportProviderMethod) - .build()) - .setMethodName("build") - .build(); - MethodInvocationExpr credentialsMethodExpr = - MethodInvocationExpr.builder() - .setExprReferenceExpr(newBuilderMethodExpr) - .setArguments(transportChannelProviderArg) - .setMethodName("setTransportChannelProvider") + .setMethodName(transportBuilderMethod) .build(); MethodInvocationExpr buildMethodExpr = MethodInvocationExpr.builder() - .setExprReferenceExpr(credentialsMethodExpr) + .setExprReferenceExpr(newBuilderMethodExpr) .setReturnType(settingsType) .setMethodName("build") .build(); diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden index 5e38c6d146..15d3a77a29 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden @@ -105,11 +105,7 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoSettings echoSettings = - * EchoSettings.newBuilder() - * .setTransportChannelProvider( - * EchoSettings.defaultHttpJsonTransportProviderBuilder().build()) - * .build(); + * EchoSettings echoSettings = EchoSettings.newHttpJsonBuilder().build(); * EchoClient echoClient = EchoClient.create(echoSettings); * } * diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden index 0165872e80..d9708af4ae 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden @@ -85,11 +85,7 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoEmpySettings echoEmpySettings = - * EchoEmpySettings.newBuilder() - * .setTransportChannelProvider( - * EchoEmpySettings.defaultHttpJsonTransportProviderBuilder().build()) - * .build(); + * EchoEmpySettings echoEmpySettings = EchoEmpySettings.newHttpJsonBuilder().build(); * EchoEmpyClient echoEmpyClient = EchoEmpyClient.create(echoEmpySettings); * } * From cd35be87e569101ab0181e43799a31805c387503 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Tue, 1 Nov 2022 17:14:13 -0400 Subject: [PATCH 063/103] fix: fixes regionTag breakage (#1068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fixes regionTag breakage * update credentials integration test * removing getPureServiceName function * linter * refactor test * chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * refactor: expose parsed api short name and version as fields in Service (#1075) * Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. * Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated) * This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process. * fix: fix REST transport client creation generated javadoc sample (#1077) * fix: fixes regionTag breakage * remove errant comment Co-authored-by: WhiteSource Renovate Co-authored-by: Emily Wang Co-authored-by: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> --- .../AbstractServiceClientClassComposer.java | 39 ++- .../grpcrest/ServiceClientClassComposer.java | 8 +- ...iceClientCallableMethodSampleComposer.java | 66 +++-- .../ServiceClientHeaderSampleComposer.java | 40 +-- .../ServiceClientMethodSampleComposer.java | 40 +-- .../gapic/composer/utils/ClassNames.java | 9 - ...lientCallableMethodSampleComposerTest.java | 258 ++++++++++++++++-- ...ServiceClientHeaderSampleComposerTest.java | 109 +++++++- ...ServiceClientMethodSampleComposerTest.java | 80 +++++- .../gapic/composer/utils/ClassNamesTest.java | 31 --- .../AsyncCheckAndMutateRow.java | 4 +- .../SyncCheckAndMutateRow.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../mutaterow/AsyncMutateRow.java | 4 +- .../mutaterow/SyncMutateRow.java | 4 +- ...MutateRowStringBytestringListmutation.java | 4 +- ...RowStringBytestringListmutationString.java | 4 +- ...ateRowTablenameBytestringListmutation.java | 4 +- ...TablenameBytestringListmutationString.java | 4 +- .../mutaterows/AsyncMutateRows.java | 4 +- .../AsyncReadModifyWriteRow.java | 4 +- .../SyncReadModifyWriteRow.java | 4 +- ...ringBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- ...nameBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- .../readrows/AsyncReadRows.java | 4 +- .../samplerowkeys/AsyncSampleRowKeys.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../AsyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- ...countnameListstringListstringDuration.java | 4 +- ...kenStringListstringListstringDuration.java | 4 +- .../generateidtoken/AsyncGenerateIdToken.java | 4 +- .../generateidtoken/SyncGenerateIdToken.java | 4 +- ...iceaccountnameListstringStringBoolean.java | 4 +- ...eIdTokenStringListstringStringBoolean.java | 4 +- .../signblob/AsyncSignBlob.java | 4 +- .../iamcredentials/signblob/SyncSignBlob.java | 4 +- ...erviceaccountnameListstringBytestring.java | 4 +- ...yncSignBlobStringListstringBytestring.java | 4 +- .../iamcredentials/signjwt/AsyncSignJwt.java | 4 +- .../iamcredentials/signjwt/SyncSignJwt.java | 4 +- ...JwtServiceaccountnameListstringString.java | 4 +- .../SyncSignJwtStringListstringString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbucket/AsyncCreateBucket.java | 4 +- .../createbucket/SyncCreateBucket.java | 4 +- .../createexclusion/AsyncCreateExclusion.java | 4 +- .../createexclusion/SyncCreateExclusion.java | 4 +- ...clusionBillingaccountnameLogexclusion.java | 4 +- ...CreateExclusionFoldernameLogexclusion.java | 4 +- ...ExclusionOrganizationnameLogexclusion.java | 4 +- ...reateExclusionProjectnameLogexclusion.java | 4 +- ...SyncCreateExclusionStringLogexclusion.java | 4 +- .../createsink/AsyncCreateSink.java | 4 +- .../createsink/SyncCreateSink.java | 4 +- ...ncCreateSinkBillingaccountnameLogsink.java | 4 +- .../SyncCreateSinkFoldernameLogsink.java | 4 +- ...SyncCreateSinkOrganizationnameLogsink.java | 4 +- .../SyncCreateSinkProjectnameLogsink.java | 4 +- .../SyncCreateSinkStringLogsink.java | 4 +- .../createview/AsyncCreateView.java | 4 +- .../createview/SyncCreateView.java | 4 +- .../deletebucket/AsyncDeleteBucket.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- .../deleteexclusion/AsyncDeleteExclusion.java | 4 +- .../deleteexclusion/SyncDeleteExclusion.java | 4 +- .../SyncDeleteExclusionLogexclusionname.java | 4 +- .../SyncDeleteExclusionString.java | 4 +- .../deletesink/AsyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSinkLogsinkname.java | 4 +- .../deletesink/SyncDeleteSinkString.java | 4 +- .../deleteview/AsyncDeleteView.java | 4 +- .../deleteview/SyncDeleteView.java | 4 +- .../getbucket/AsyncGetBucket.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../getcmeksettings/AsyncGetCmekSettings.java | 4 +- .../getcmeksettings/SyncGetCmekSettings.java | 4 +- .../getexclusion/AsyncGetExclusion.java | 4 +- .../getexclusion/SyncGetExclusion.java | 4 +- .../SyncGetExclusionLogexclusionname.java | 4 +- .../getexclusion/SyncGetExclusionString.java | 4 +- .../getsink/AsyncGetSink.java | 4 +- .../getsink/SyncGetSink.java | 4 +- .../getsink/SyncGetSinkLogsinkname.java | 4 +- .../getsink/SyncGetSinkString.java | 4 +- .../getview/AsyncGetView.java | 4 +- .../getview/SyncGetView.java | 4 +- .../listbuckets/AsyncListBuckets.java | 4 +- .../listbuckets/AsyncListBucketsPaged.java | 4 +- .../listbuckets/SyncListBuckets.java | 4 +- ...ListBucketsBillingaccountlocationname.java | 4 +- .../SyncListBucketsFolderlocationname.java | 4 +- .../SyncListBucketsLocationname.java | 4 +- ...ncListBucketsOrganizationlocationname.java | 4 +- .../listbuckets/SyncListBucketsString.java | 4 +- .../listexclusions/AsyncListExclusions.java | 4 +- .../AsyncListExclusionsPaged.java | 4 +- .../listexclusions/SyncListExclusions.java | 4 +- .../SyncListExclusionsBillingaccountname.java | 4 +- .../SyncListExclusionsFoldername.java | 4 +- .../SyncListExclusionsOrganizationname.java | 4 +- .../SyncListExclusionsProjectname.java | 4 +- .../SyncListExclusionsString.java | 4 +- .../listsinks/AsyncListSinks.java | 4 +- .../listsinks/AsyncListSinksPaged.java | 4 +- .../listsinks/SyncListSinks.java | 4 +- .../SyncListSinksBillingaccountname.java | 4 +- .../listsinks/SyncListSinksFoldername.java | 4 +- .../SyncListSinksOrganizationname.java | 4 +- .../listsinks/SyncListSinksProjectname.java | 4 +- .../listsinks/SyncListSinksString.java | 4 +- .../listviews/AsyncListViews.java | 4 +- .../listviews/AsyncListViewsPaged.java | 4 +- .../listviews/SyncListViews.java | 4 +- .../listviews/SyncListViewsString.java | 4 +- .../undeletebucket/AsyncUndeleteBucket.java | 4 +- .../undeletebucket/SyncUndeleteBucket.java | 4 +- .../updatebucket/AsyncUpdateBucket.java | 4 +- .../updatebucket/SyncUpdateBucket.java | 4 +- .../AsyncUpdateCmekSettings.java | 4 +- .../SyncUpdateCmekSettings.java | 4 +- .../updateexclusion/AsyncUpdateExclusion.java | 4 +- .../updateexclusion/SyncUpdateExclusion.java | 4 +- ...LogexclusionnameLogexclusionFieldmask.java | 4 +- ...eExclusionStringLogexclusionFieldmask.java | 4 +- .../updatesink/AsyncUpdateSink.java | 4 +- .../updatesink/SyncUpdateSink.java | 4 +- .../SyncUpdateSinkLogsinknameLogsink.java | 4 +- ...UpdateSinkLogsinknameLogsinkFieldmask.java | 4 +- .../SyncUpdateSinkStringLogsink.java | 4 +- .../SyncUpdateSinkStringLogsinkFieldmask.java | 4 +- .../updateview/AsyncUpdateView.java | 4 +- .../updateview/SyncUpdateView.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../deletelog/AsyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLogLogname.java | 4 +- .../deletelog/SyncDeleteLogString.java | 4 +- .../listlogentries/AsyncListLogEntries.java | 4 +- .../AsyncListLogEntriesPaged.java | 4 +- .../listlogentries/SyncListLogEntries.java | 4 +- ...cListLogEntriesListstringStringString.java | 4 +- .../listlogs/AsyncListLogs.java | 4 +- .../listlogs/AsyncListLogsPaged.java | 4 +- .../listlogs/SyncListLogs.java | 4 +- .../SyncListLogsBillingaccountname.java | 4 +- .../listlogs/SyncListLogsFoldername.java | 4 +- .../SyncListLogsOrganizationname.java | 4 +- .../listlogs/SyncListLogsProjectname.java | 4 +- .../listlogs/SyncListLogsString.java | 4 +- ...AsyncListMonitoredResourceDescriptors.java | 4 +- ...ListMonitoredResourceDescriptorsPaged.java | 4 +- .../SyncListMonitoredResourceDescriptors.java | 4 +- .../taillogentries/AsyncTailLogEntries.java | 4 +- .../writelogentries/AsyncWriteLogEntries.java | 4 +- .../writelogentries/SyncWriteLogEntries.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createlogmetric/AsyncCreateLogMetric.java | 4 +- .../createlogmetric/SyncCreateLogMetric.java | 4 +- ...ncCreateLogMetricProjectnameLogmetric.java | 4 +- .../SyncCreateLogMetricStringLogmetric.java | 4 +- .../deletelogmetric/AsyncDeleteLogMetric.java | 4 +- .../deletelogmetric/SyncDeleteLogMetric.java | 4 +- .../SyncDeleteLogMetricLogmetricname.java | 4 +- .../SyncDeleteLogMetricString.java | 4 +- .../getlogmetric/AsyncGetLogMetric.java | 4 +- .../getlogmetric/SyncGetLogMetric.java | 4 +- .../SyncGetLogMetricLogmetricname.java | 4 +- .../getlogmetric/SyncGetLogMetricString.java | 4 +- .../listlogmetrics/AsyncListLogMetrics.java | 4 +- .../AsyncListLogMetricsPaged.java | 4 +- .../listlogmetrics/SyncListLogMetrics.java | 4 +- .../SyncListLogMetricsProjectname.java | 4 +- .../SyncListLogMetricsString.java | 4 +- .../updatelogmetric/AsyncUpdateLogMetric.java | 4 +- .../updatelogmetric/SyncUpdateLogMetric.java | 4 +- ...UpdateLogMetricLogmetricnameLogmetric.java | 4 +- .../SyncUpdateLogMetricStringLogmetric.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createtopic/AsyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopicString.java | 4 +- .../createtopic/SyncCreateTopicTopicname.java | 4 +- .../deletetopic/AsyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopicString.java | 4 +- .../deletetopic/SyncDeleteTopicTopicname.java | 4 +- .../AsyncDetachSubscription.java | 4 +- .../SyncDetachSubscription.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../gettopic/AsyncGetTopic.java | 4 +- .../gettopic/SyncGetTopic.java | 4 +- .../gettopic/SyncGetTopicString.java | 4 +- .../gettopic/SyncGetTopicTopicname.java | 4 +- .../listtopics/AsyncListTopics.java | 4 +- .../listtopics/AsyncListTopicsPaged.java | 4 +- .../listtopics/SyncListTopics.java | 4 +- .../listtopics/SyncListTopicsProjectname.java | 4 +- .../listtopics/SyncListTopicsString.java | 4 +- .../AsyncListTopicSnapshots.java | 4 +- .../AsyncListTopicSnapshotsPaged.java | 4 +- .../SyncListTopicSnapshots.java | 4 +- .../SyncListTopicSnapshotsString.java | 4 +- .../SyncListTopicSnapshotsTopicname.java | 4 +- .../AsyncListTopicSubscriptions.java | 4 +- .../AsyncListTopicSubscriptionsPaged.java | 4 +- .../SyncListTopicSubscriptions.java | 4 +- .../SyncListTopicSubscriptionsString.java | 4 +- .../SyncListTopicSubscriptionsTopicname.java | 4 +- .../publish/AsyncPublish.java | 4 +- .../publish/SyncPublish.java | 4 +- .../SyncPublishStringListpubsubmessage.java | 4 +- ...SyncPublishTopicnameListpubsubmessage.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatetopic/AsyncUpdateTopic.java | 4 +- .../updatetopic/SyncUpdateTopic.java | 4 +- .../acknowledge/AsyncAcknowledge.java | 4 +- .../acknowledge/SyncAcknowledge.java | 4 +- .../SyncAcknowledgeStringListstring.java | 4 +- ...AcknowledgeSubscriptionnameListstring.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createsnapshot/AsyncCreateSnapshot.java | 4 +- .../createsnapshot/SyncCreateSnapshot.java | 4 +- .../SyncCreateSnapshotSnapshotnameString.java | 4 +- ...eSnapshotSnapshotnameSubscriptionname.java | 4 +- .../SyncCreateSnapshotStringString.java | 4 +- ...cCreateSnapshotStringSubscriptionname.java | 4 +- .../AsyncCreateSubscription.java | 4 +- .../SyncCreateSubscription.java | 4 +- ...SubscriptionStringStringPushconfigInt.java | 4 +- ...scriptionStringTopicnamePushconfigInt.java | 4 +- ...onSubscriptionnameStringPushconfigInt.java | 4 +- ...ubscriptionnameTopicnamePushconfigInt.java | 4 +- .../deletesnapshot/AsyncDeleteSnapshot.java | 4 +- .../deletesnapshot/SyncDeleteSnapshot.java | 4 +- .../SyncDeleteSnapshotSnapshotname.java | 4 +- .../SyncDeleteSnapshotString.java | 4 +- .../AsyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscriptionString.java | 4 +- ...yncDeleteSubscriptionSubscriptionname.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getsnapshot/AsyncGetSnapshot.java | 4 +- .../getsnapshot/SyncGetSnapshot.java | 4 +- .../SyncGetSnapshotSnapshotname.java | 4 +- .../getsnapshot/SyncGetSnapshotString.java | 4 +- .../getsubscription/AsyncGetSubscription.java | 4 +- .../getsubscription/SyncGetSubscription.java | 4 +- .../SyncGetSubscriptionString.java | 4 +- .../SyncGetSubscriptionSubscriptionname.java | 4 +- .../listsnapshots/AsyncListSnapshots.java | 4 +- .../AsyncListSnapshotsPaged.java | 4 +- .../listsnapshots/SyncListSnapshots.java | 4 +- .../SyncListSnapshotsProjectname.java | 4 +- .../SyncListSnapshotsString.java | 4 +- .../AsyncListSubscriptions.java | 4 +- .../AsyncListSubscriptionsPaged.java | 4 +- .../SyncListSubscriptions.java | 4 +- .../SyncListSubscriptionsProjectname.java | 4 +- .../SyncListSubscriptionsString.java | 4 +- .../AsyncModifyAckDeadline.java | 4 +- .../SyncModifyAckDeadline.java | 4 +- ...cModifyAckDeadlineStringListstringInt.java | 4 +- ...DeadlineSubscriptionnameListstringInt.java | 4 +- .../AsyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfigStringPushconfig.java | 4 +- ...yPushConfigSubscriptionnamePushconfig.java | 4 +- .../pull/AsyncPull.java | 4 +- .../pull/SyncPull.java | 4 +- .../pull/SyncPullStringBooleanInt.java | 4 +- .../pull/SyncPullStringInt.java | 4 +- .../SyncPullSubscriptionnameBooleanInt.java | 4 +- .../pull/SyncPullSubscriptionnameInt.java | 4 +- .../seek/AsyncSeek.java | 4 +- .../seek/SyncSeek.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../streamingpull/AsyncStreamingPull.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatesnapshot/AsyncUpdateSnapshot.java | 4 +- .../updatesnapshot/SyncUpdateSnapshot.java | 4 +- .../AsyncUpdateSubscription.java | 4 +- .../SyncUpdateSubscription.java | 4 +- 306 files changed, 1118 insertions(+), 746 deletions(-) delete mode 100644 src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/AsyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/AsyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowStringBytestringListmutation.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowStringBytestringListmutationString.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowTablenameBytestringListmutation.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterows/AsyncMutateRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/AsyncReadModifyWriteRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readrows/AsyncReadRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/samplerowkeys/AsyncSampleRowKeys.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createbucket/AsyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createbucket/SyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/AsyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionStringLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/AsyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkBillingaccountnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkFoldernameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkOrganizationnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkProjectnameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createview/AsyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createview/SyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletebucket/AsyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/AsyncDeleteExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusion.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusionLogexclusionname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/AsyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSinkString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteview/AsyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteview/SyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getbucket/AsyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getbucket/SyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getcmeksettings/AsyncGetCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getcmeksettings/SyncGetCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/AsyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusionLogexclusionname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/AsyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSinkString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getview/AsyncGetView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getview/SyncGetView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/AsyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsBillingaccountlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsFolderlocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsLocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsOrganizationlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/AsyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/AsyncListExclusionsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsBillingaccountname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/AsyncListSinks.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/AsyncListSinksPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinks.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/AsyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/AsyncListViewsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/SyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/SyncListViewsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/undeletebucket/AsyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/undeletebucket/SyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatebucket/SyncUpdateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatecmeksettings/AsyncUpdateCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatecmeksettings/SyncUpdateCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/AsyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/AsyncUpdateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkLogsinknameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateview/AsyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateview/SyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/AsyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLogLogname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLogString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/AsyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/AsyncListLogEntriesPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/SyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/SyncListLogEntriesListstringStringString.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/AsyncListLogs.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/AsyncListLogsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogs.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/taillogentries/AsyncTailLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/AsyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/AsyncCreateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/AsyncDeleteLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetricLogmetricname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/AsyncGetLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetricLogmetricname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/AsyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/AsyncListLogMetricsPaged.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetricsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetricsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/AsyncUpdateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/create/SyncCreateSetCredentialsProvider.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/AsyncCreateTopic.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/AsyncDeleteTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/detachsubscription/AsyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/detachsubscription/SyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/getiampolicy/AsyncGetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/getiampolicy/SyncGetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/AsyncGetTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/AsyncListTopics.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/AsyncListTopicsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopics.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopicsProjectname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopicsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/AsyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshotsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/AsyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/AsyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublishStringListpubsubmessage.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublishTopicnameListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/setiampolicy/AsyncSetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/testiampermissions/AsyncTestIamPermissions.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/updatetopic/AsyncUpdateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/updatetopic/SyncUpdateTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/AsyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledgeStringListstring.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/AsyncCreateSnapshot.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotSnapshotnameString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotStringString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/AsyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/AsyncDeleteSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshotSnapshotname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/AsyncDeleteSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/AsyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshotSnapshotname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/AsyncGetSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/AsyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/AsyncListSnapshotsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshotsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/AsyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/AsyncListSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptionsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/AsyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/AsyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfigStringPushconfig.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/AsyncPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullStringBooleanInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullStringInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullSubscriptionnameBooleanInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullSubscriptionnameInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/seek/AsyncSeek.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/seek/SyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/streamingpull/AsyncStreamingPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesnapshot/AsyncUpdateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesnapshot/SyncUpdateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesubscription/AsyncUpdateSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesubscription/SyncUpdateSubscription.java (92%) diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 073023cfad..b6095be08b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -200,9 +200,11 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample( + clientType, settingsType, service); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, service); samples.addAll(Arrays.asList(classMethodSampleCode, credentialsSampleCode, endpointSampleCode)); return ServiceClientCommentComposer.createClassHeaderComments( service, @@ -580,7 +582,8 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples); + samples, + service); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata @@ -598,7 +601,8 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples); + samples, + service); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata.get(method.name()).add(javaMethodNameFn.apply(generatedMethod)); @@ -638,7 +642,8 @@ private static List createMethodVariants( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples) { + List samples, + Service service) { List javaMethods = new ArrayList<>(); String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); @@ -702,7 +707,12 @@ private static List createMethodVariants( Optional methodSample = Optional.of( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, typeStore.get(clientName), signature, resourceNames, messageTypes)); + method, + typeStore.get(clientName), + signature, + resourceNames, + messageTypes, + service)); Optional methodDocSample = Optional.empty(); if (methodSample.isPresent()) { samples.add(methodSample.get()); @@ -746,7 +756,8 @@ private static MethodDefinition createMethodDefaultMethod( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples) { + List samples, + Service service) { String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); TypeNode methodOutputType = @@ -790,7 +801,7 @@ private static MethodDefinition createMethodDefaultMethod( Optional defaultMethodSample = Optional.of( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, typeStore.get(clientName), resourceNames, messageTypes)); + method, typeStore.get(clientName), resourceNames, messageTypes, service)); Optional defaultMethodDocSample = Optional.empty(); if (defaultMethodSample.isPresent()) { samples.add(defaultMethodSample.get()); @@ -932,7 +943,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else if (callableMethodKind.equals(CallableMethodKind.PAGED)) { sampleCode = Optional.of( @@ -940,7 +952,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else if (callableMethodKind.equals(CallableMethodKind.REGULAR)) { if (method.stream().equals(Stream.NONE)) { sampleCode = @@ -949,7 +962,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else { sampleCode = Optional.of( @@ -957,7 +971,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } } Optional sampleDocCode = Optional.empty(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index 5eb48fa06a..8933b7b4ed 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -54,12 +54,14 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample( + clientType, settingsType, service); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, service); Sample transportSampleCode = ServiceClientHeaderSampleComposer.composeTransportSample( - clientType, settingsType, "newHttpJsonBuilder"); + clientType, settingsType, "newHttpJsonBuilder", service); samples.addAll( Arrays.asList( classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode)); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java index 07bdcd29a7..342fab52ad 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java @@ -42,13 +42,13 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.ast.WhileStatement; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -61,7 +61,7 @@ public class ServiceClientCallableMethodSampleComposer { private static Sample composeUnaryOrLroCallableSample( - Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr) { + Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, Service service) { List bodyStatements = new ArrayList<>(); // Create api future variable expression, and assign it with a value by invoking callable // method. @@ -125,8 +125,7 @@ private static Sample composeUnaryOrLroCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -141,7 +140,8 @@ private static Sample composePagedCallableSample( Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, - Map messageTypes) { + Map messageTypes, + Service service) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); Field repeatedPagedResultsField = methodOutputMessage.findAndUnwrapPaginatedRepeatedField(); @@ -280,8 +280,7 @@ private static Sample composePagedCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation("Paged") .setIsAsynchronous(true) @@ -297,7 +296,8 @@ public static Sample composeLroCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -397,7 +397,7 @@ public static Sample composeLroCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .setOverloadDisambiguation("LRO") @@ -418,7 +418,8 @@ public static Sample composePagedCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -534,7 +535,7 @@ public static Sample composePagedCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -546,7 +547,8 @@ public static Sample composeRegularCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -578,13 +580,13 @@ public static Sample composeRegularCallableMethod( RegionTag regionTag; if (method.isPaged()) { Sample pagedCallable = - composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes); + composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes, service); bodyStatements.addAll(pagedCallable.body()); regionTag = pagedCallable.regionTag(); } else { // e.g. echoClient.echoCallable().futureCall(request) Sample unaryOrLroCallable = - composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr); + composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr, service); bodyStatements.addAll(unaryOrLroCallable.body()); regionTag = unaryOrLroCallable.regionTag(); } @@ -604,7 +606,8 @@ public static Sample composeStreamCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -633,16 +636,19 @@ public static Sample composeStreamCallableMethod( List bodyStatements = new ArrayList<>(); if (method.stream().equals(Method.Stream.SERVER)) { // e.g. ServerStream stream = echoClient.expandCallable().call(request); - Sample streamServer = composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamServer = + composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamServer.body()); regionTag = streamServer.regionTag(); } else if (method.stream().equals(Method.Stream.BIDI)) { // e.g. echoClient.collect().clientStreamingCall(responseObserver); - Sample streamBidi = composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamBidi = + composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamBidi.body()); regionTag = streamBidi.regionTag(); } else if (method.stream().equals(Method.Stream.CLIENT)) { - Sample streamClient = composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamClient = + composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamClient.body()); regionTag = streamClient.regionTag(); } @@ -659,7 +665,10 @@ public static Sample composeStreamCallableMethod( } private static Sample composeStreamServerSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); bodyExprs.add(requestAssignmentExpr); @@ -720,8 +729,7 @@ private static Sample composeStreamServerSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -729,7 +737,10 @@ private static Sample composeStreamServerSample( } private static Sample composeStreamBidiSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); // Create bidi stream variable expression and assign it with invoking client's bidi stream @@ -800,8 +811,7 @@ private static Sample composeStreamBidiSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -809,7 +819,10 @@ private static Sample composeStreamBidiSample( } private static Sample composeStreamClientSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); // Create responseObserver variable expression. @@ -933,8 +946,7 @@ private static Sample composeStreamClientSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index 11f70bcb27..b979f87744 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -27,7 +27,6 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.HttpBindings; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; @@ -54,7 +53,7 @@ public static Sample composeClassHeaderSample( Map resourceNames, Map messageTypes) { if (service.methods().isEmpty()) { - return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType); + return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType, service); } // Use the first pure unary RPC method's sample code as showcase, if no such method exists, use @@ -68,13 +67,18 @@ public static Sample composeClassHeaderSample( if (method.stream() == Method.Stream.NONE) { if (method.methodSignatures().isEmpty()) { return ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes); + method, clientType, resourceNames, messageTypes, service); } return composeShowcaseMethodSample( - method, clientType, method.methodSignatures().get(0), resourceNames, messageTypes); + method, + clientType, + method.methodSignatures().get(0), + resourceNames, + messageTypes, + service); } return ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes); + method, clientType, resourceNames, messageTypes, service); } public static Sample composeShowcaseMethodSample( @@ -82,7 +86,8 @@ public static Sample composeShowcaseMethodSample( TypeNode clientType, List arguments, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -106,20 +111,20 @@ public static Sample composeShowcaseMethodSample( if (method.isPaged()) { Sample unaryPagedRpc = ServiceClientMethodSampleComposer.composePagedSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { Sample unaryLroRpc = ServiceClientMethodSampleComposer.composeLroSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(), echoClient.echo(...) Sample unaryRpc = ServiceClientMethodSampleComposer.composeSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -135,7 +140,8 @@ public static Sample composeShowcaseMethodSample( return Sample.builder().setBody(body).setRegionTag(regionTag).build(); } - public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode settingsType) { + public static Sample composeSetCredentialsSample( + TypeNode clientType, TypeNode settingsType, Service service) { // Initialize clientSettings with builder() method. // e.g. EchoSettings echoSettings = // EchoSettings.newBuilder().setCredentialsProvider(FixedCredentialsProvider.create("myCredentials")).build(); @@ -207,14 +213,16 @@ public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode s ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); - return Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); + Sample sample = Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); + return sample.withRegionTag(sample.regionTag()); } - public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode settingsType) { + public static Sample composeSetEndpointSample( + TypeNode clientType, TypeNode settingsType, Service service) { // Initialize client settings with builder() method. // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build(); String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); @@ -274,7 +282,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett .build(); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setEndpoint") .build(); @@ -285,7 +293,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett } public static Sample composeTransportSample( - TypeNode clientType, TypeNode settingsType, String transportBuilderMethod) { + TypeNode clientType, TypeNode settingsType, String transportBuilderMethod, Service service) { String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = @@ -332,7 +340,7 @@ public static Sample composeTransportSample( ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java index 5a45173595..311ebab5ac 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java @@ -27,13 +27,13 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -46,7 +46,7 @@ public class ServiceClientMethodSampleComposer { // Creates an example for an empty service (no API methods), which is a corner case but can // happen. Generated example will only show how to instantiate the client class but will not call // any API methods (because there are no API methods). - public static Sample composeEmptyServiceSample(TypeNode clientType) { + public static Sample composeEmptyServiceSample(TypeNode clientType, Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -57,11 +57,7 @@ public static Sample composeEmptyServiceSample(TypeNode clientType) { List bodyStatements = new ArrayList<>(); RegionTag regionTag = - RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) - .setRpcName("emtpy") - .build(); + RegionTag.builder().setServiceName(service.name()).setRpcName("emtpy").build(); List body = Arrays.asList( @@ -78,7 +74,8 @@ public static Sample composeCanonicalSample( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -113,16 +110,19 @@ public static Sample composeCanonicalSample( if (method.isPaged()) { // e.g. echoClient.pagedExpand(request).iterateAll() Sample unaryPagedRpc = - composePagedSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); + composePagedSample( + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { - Sample unaryLroRpc = composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + Sample unaryLroRpc = + composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(request) - Sample unaryRpc = composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + Sample unaryRpc = + composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -142,7 +142,8 @@ static Sample composeSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs) { + List bodyExprs, + Service service) { // Invoke current method based on return type. // e.g. if return void, echoClient.echo(..); or, @@ -171,8 +172,7 @@ static Sample composeSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -189,7 +189,8 @@ static Sample composePagedSample( VariableExpr clientVarExpr, List rpcMethodArgVarExprs, List bodyExprs, - Map messageTypes) { + Map messageTypes, + Service service) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); @@ -246,8 +247,7 @@ static Sample composePagedSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -259,7 +259,8 @@ static Sample composeLroSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs) { + List bodyExprs, + Service service) { // Assign response variable with invoking client's LRO method. // e.g. if return void, echoClient.waitAsync(ttl).get(); or, // e.g. if return other type, WaitResponse response = echoClient.waitAsync(ttl).get(); @@ -297,8 +298,7 @@ static Sample composeLroSample( } RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) diff --git a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java index 9d3a93162b..1228e5d166 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java +++ b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java @@ -15,8 +15,6 @@ package com.google.api.generator.gapic.composer.utils; import com.google.api.generator.gapic.model.Service; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -123,11 +121,4 @@ private static String monolithBackwardsCompatibleName(String rawServiceName) { ? rawServiceName.replace("IAM", "Iam") : rawServiceName; } - - // For region tags, the service name should not include `Client` in the name - public static String getPureServiceName(String serviceClassName) { - return String.format( - "%s", - Iterables.getFirst(Splitter.on(CLIENT_SUFFIX).split(serviceClassName), serviceClassName)); - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java index 2199c2f49d..3edd5936de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java @@ -22,6 +22,7 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors; @@ -37,6 +38,16 @@ public class ServiceClientCallableMethodSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; + private static final Service BasicService = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .build(); /*Testing composeLroCallableMethod*/ @Test @@ -83,10 +94,21 @@ public void valid_composeLroCallableMethod_withReturnResponse() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -140,10 +162,21 @@ public void valid_composeLroCallableMethod_withReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -187,10 +220,21 @@ public void valid_composePagedCallableMethod() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -240,11 +284,22 @@ public void invalid_composePagedCallableMethod_inputTypeNotExistInMessage() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -277,11 +332,22 @@ public void invalid_composePagedCallableMethod_noExistMethodResponse() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -328,11 +394,22 @@ public void invalid_composePagedCallableMethod_noRepeatedResponse() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } /*Testing composeStreamCallableMethod*/ @@ -366,10 +443,21 @@ public void valid_composeStreamCallableMethod_serverStream() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -413,11 +501,22 @@ public void invalid_composeStreamCallableMethod_serverStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -450,10 +549,21 @@ public void valid_composeStreamCallableMethod_bidiStream() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -506,11 +616,22 @@ public void invalid_composeStreamCallableMethod_bidiStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -543,10 +664,21 @@ public void valid_composeStreamCallableMethod_clientStream() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -613,11 +745,22 @@ public void invalid_composeStreamCallableMethod_clientStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } /*Testing composeRegularCallableMethod*/ @@ -646,10 +789,21 @@ public void valid_composeRegularCallableMethod_unaryRpc() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -713,10 +867,21 @@ public void valid_composeRegularCallableMethod_lroRpc() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -769,10 +934,21 @@ public void valid_composeRegularCallableMethod_lroRpcWithReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -815,10 +991,21 @@ public void valid_composeRegularCallableMethod_pageRpc() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -869,11 +1056,22 @@ public void invalid_composeRegularCallableMethod_noExistMethodRequest() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -906,11 +1104,22 @@ public void invalid_composeRegularCallableMethod_noExistMethodResponsePagedRpc() .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -957,11 +1166,22 @@ public void invalid_composeRegularCallableMethod_noRepeatedResponsePagedRpc() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } private String writeStatements(Sample sample) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java index 32ab486356..64593d0fea 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java @@ -45,6 +45,16 @@ public class ServiceClientHeaderSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; + private static final Service TEST_SERVICE = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .build(); /*Testing composeClassHeaderSample*/ @Test @@ -297,7 +307,7 @@ public void composeSetCredentialsSample() { String results = writeStatements( ServiceClientHeaderSampleComposer.composeSetCredentialsSample( - clientType, settingsType)); + clientType, settingsType, TEST_SERVICE)); String expected = LineFormatter.lines( "EchoSettings echoSettings =\n", @@ -325,7 +335,8 @@ public void composeSetEndpointSample() { .build()); String results = writeStatements( - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType)); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, TEST_SERVICE)); String expected = LineFormatter.lines( "EchoSettings echoSettings =" @@ -340,6 +351,7 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument Descriptors.FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor(); Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); Map messageTypes = Parser.parseMessages(echoFileDescriptor); + TypeNode clientType = TypeNode.withReference( VaporReference.builder() @@ -413,11 +425,22 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -487,11 +510,22 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithNoMethodArguments() { .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -534,11 +568,22 @@ public void invalid_composeShowcaseMethodSample_noMatchedRepeatedResponseTypeInP .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes)); + method, clientType, methodArguments, resourceNames, messageTypes, service)); } @Test @@ -595,11 +640,22 @@ public void invalid_composeShowcaseMethodSample_noRepeatedResponseTypeInPagedMet .setFields(Arrays.asList(responseField, nextPageToken)) .build(); messageTypes.put("PagedResponse", noRepeatedFieldMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes)); + method, clientType, methodArguments, resourceNames, messageTypes, service)); } @Test @@ -647,11 +703,21 @@ public void valid_composeShowcaseMethodSample_lroUnaryRpcWithNoMethodArgument() .setLro(lro) .setMethodSignatures(Collections.emptyList()) .build(); - + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, Collections.emptyList(), resourceNames, messageTypes)); + method, clientType, Collections.emptyList(), resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -722,10 +788,21 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnResponseType() { .setMethodSignatures(Arrays.asList(arguments)) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -793,11 +870,21 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnVoid() { .setLro(lro) .setMethodSignatures(Arrays.asList(arguments)) .build(); - + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java index bd6366b11f..68b76374a9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java @@ -21,10 +21,12 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; +import java.util.Arrays; import java.util.Collections; import java.util.Map; import org.junit.Assert; @@ -67,10 +69,21 @@ public void valid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -118,11 +131,22 @@ public void invalid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -167,10 +191,21 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnResponse() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -225,10 +260,21 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnVoid() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -265,10 +311,21 @@ public void valid_composeDefaultSample_pureUnaryReturnVoid() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -316,10 +373,21 @@ public void valid_composeDefaultSample_pureUnaryReturnResponse() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java b/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java deleted file mode 100644 index b393a5bed3..0000000000 --- a/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java +++ /dev/null @@ -1,31 +0,0 @@ -// 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.utils; - -import org.junit.Assert; -import org.junit.Test; - -public class ClassNamesTest { - @Test - public void getPureServiceName_returnsServiceName() { - Assert.assertEquals(ClassNames.getPureServiceName("EchoClient"), "Echo"); - Assert.assertEquals(ClassNames.getPureServiceName("Echo"), "Echo"); - Assert.assertEquals(ClassNames.getPureServiceName(""), ""); - Assert.assertEquals(ClassNames.getPureServiceName("ClientEcho"), ""); - Assert.assertEquals(ClassNames.getPureServiceName("echoclient"), "echoclient"); - Assert.assertEquals(ClassNames.getPureServiceName("echoClient"), "echo"); - Assert.assertEquals(ClassNames.getPureServiceName("echoServiceClient"), "echoService"); - } -} diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java index 5512d59424..d7d8937ff7 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; @@ -56,4 +56,4 @@ public static void asyncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java index 6b77dd5c0d..cf3eb73ece 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java index 803d65bc7b..1951fd7be8 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java index 1280e1fa29..7999251391 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java index 5cf895095e..94b3498d56 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowTablenameBytestringRowfilterListmutation } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java index 9cdcf53a07..ae5cef236b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -53,4 +53,4 @@ public static void main(String[] args) throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java index f66938186f..7f26aef4f9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] +// [START bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] +// [END bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java index f6f57cfa51..c1a6d75ae8 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] +// [START bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import com.google.cloud.bigtable.data.v2.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] +// [END bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java index 50662848b6..7475c57d0a 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_async] +// [START bigtable_v2_generated_Bigtable_MutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; @@ -53,4 +53,4 @@ public static void asyncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_async] +// [END bigtable_v2_generated_Bigtable_MutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java index 2a781526b9..1d7439c6ca 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_sync] import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -49,4 +49,4 @@ public static void syncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java index cba00753a5..03d7191440 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowStringBytestringListmutation() throws Exception } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java index cce51bae93..dc2ce87b85 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowStringBytestringListmutationString() throws Exce } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java index ae4227348b..bab53b1aa9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowTablenameBytestringListmutation() throws Excepti } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java index 2bc9e66996..3802b87ef1 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowTablenameBytestringListmutationString() throws E } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java index ef7cc157a2..452920dccf 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRows_async] +// [START bigtable_v2_generated_Bigtable_MutateRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.MutateRowsRequest; import com.google.bigtable.v2.MutateRowsResponse; @@ -51,4 +51,4 @@ public static void asyncMutateRows() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRows_async] +// [END bigtable_v2_generated_Bigtable_MutateRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java index 961a96ee4a..8ff05b78fb 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; @@ -53,4 +53,4 @@ public static void asyncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java index 1c79af443d..4fc565753f 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; @@ -49,4 +49,4 @@ public static void syncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java index 05c6a3709c..0d065192e7 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java index 655f810290..958365977e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java index 15f16dd17e..9369754dfa 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java index 5bfa5b796c..db2d6d950b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java index 745e7fbdc0..3228987659 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadRows_async] +// [START bigtable_v2_generated_Bigtable_ReadRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.ReadRowsRequest; import com.google.bigtable.v2.ReadRowsResponse; @@ -54,4 +54,4 @@ public static void asyncReadRows() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadRows_async] +// [END bigtable_v2_generated_Bigtable_ReadRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java index bd252a0f6d..113942be30 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] +// [START bigtable_v2_generated_Bigtable_SampleRowKeys_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; @@ -49,4 +49,4 @@ public static void asyncSampleRowKeys() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] +// [END bigtable_v2_generated_Bigtable_SampleRowKeys_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java index 3146b16b81..129efb9d77 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] +// [START iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] +// [END iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java index facddbfac4..186d106cf4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] +// [START iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import com.google.cloud.iam.credentials.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] +// [END iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java index dee5a52a87..08e741cc66 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; @@ -52,4 +52,4 @@ public static void asyncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java index b4ebf01b22..2a673667d2 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -48,4 +48,4 @@ public static void syncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java index ccdd12da60..d0f33dd855 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -47,4 +47,4 @@ public static void syncGenerateAccessTokenServiceaccountnameListstringListstring } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java index 0cf10fcd52..677d546b13 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateAccessTokenStringListstringListstringDuration() t } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java index f4191b5b76..14a6f9a845 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; @@ -51,4 +51,4 @@ public static void asyncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java index 8de72543a3..324dd1adf3 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -47,4 +47,4 @@ public static void syncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java index c0580eb919..cd3c4aafc4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateIdTokenServiceaccountnameListstringStringBoolean( } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java index 7ce5cb46a5..373f8a35de 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -45,4 +45,4 @@ public static void syncGenerateIdTokenStringListstringStringBoolean() throws Exc } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java index 52b0a779e4..6cafdbbfcd 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_async] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -51,4 +51,4 @@ public static void asyncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_async] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java index 8a53f4257a..a4726eba69 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobRequest; @@ -47,4 +47,4 @@ public static void syncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java index 5d7fa16f03..60eb3b8789 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobServiceaccountnameListstringBytestring() throws E } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java index d5fbb9b84e..bd0c2f01bb 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobStringListstringBytestring() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java index 4fa410b6bc..d17fc4c438 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_async] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -50,4 +50,4 @@ public static void asyncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_async] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java index 0ccf396ecf..77586e2558 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtRequest; @@ -46,4 +46,4 @@ public static void syncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java index 644b820f85..5ed7463567 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtServiceaccountnameListstringString() throws Except } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java index a6e6e0426a..04ebefdbbc 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtStringListstringString() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java index 432e6b9e51..0ede8778f3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_Config_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java index 86efaf695f..37429d4a67 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_Create_SetEndpoint_sync] +// [START logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_Config_Create_SetEndpoint_sync] +// [END logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java index 06be0eddaf..9f9c69a77d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateBucket_async] +// [START logging_v2_generated_ConfigServiceV2_CreateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; @@ -48,4 +48,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_CreateBucket_async] +// [END logging_v2_generated_ConfigServiceV2_CreateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java index f38b8b932f..5cc7bc15b2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; import com.google.logging.v2.LocationName; @@ -45,4 +45,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_CreateBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java index 147251209b..b196b21eaf 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java index 5ceb46e142..f2a6dce03c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java index e705079d85..145ed771c3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionBillingaccountnameLogexclusion() throws Ex } } } -// [END logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java index f3f10e65d9..3d2be77d9d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionFoldernameLogexclusion() throws Exception } } } -// [END logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java index f2ff73a6aa..e4198831ce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionOrganizationnameLogexclusion() throws Exce } } } -// [END logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java index 07f7abd06b..ef4e209480 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionProjectnameLogexclusion() throws Exception } } } -// [END logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java index c6080b9067..301ea7dcb3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionStringLogexclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java index 0ab887e51e..88e10b4b70 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_async] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_async] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java index c68927ba9c..35e03311e3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; import com.google.logging.v2.LogSink; @@ -45,4 +45,4 @@ public static void syncCreateSink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java index 3c639f4b92..76950150a9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkBillingaccountnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java index 24d9a1b890..935f2132c8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkFoldernameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java index db8b873e53..428ae218be 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateSinkOrganizationnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java index 4f2297db7d..f8bec0d167 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkProjectnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java index c496d95bd6..1a840db162 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_StringLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_StringLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java index 16454ea53a..b762e49489 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateView_async] +// [START logging_v2_generated_ConfigServiceV2_CreateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; @@ -47,4 +47,4 @@ public static void asyncCreateView() throws Exception { } } } -// [END logging_v2_generated_Config_CreateView_async] +// [END logging_v2_generated_ConfigServiceV2_CreateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java index 3ff765e96b..5f5ef37cb6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateView_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; import com.google.logging.v2.LogView; @@ -44,4 +44,4 @@ public static void syncCreateView() throws Exception { } } } -// [END logging_v2_generated_Config_CreateView_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java index 42fa415a17..5c587bdefd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteBucket_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteBucket_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java index 1ce7361f17..d3aa6996c2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; import com.google.logging.v2.LogBucketName; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java index 02b7bc6c5f..506e711260 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java index 659b84d869..eea1f9c310 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; import com.google.logging.v2.LogExclusionName; @@ -44,4 +44,4 @@ public static void syncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java index a135f9394e..cb6123be51 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java index 8fc355ff88..701c940ef7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_String_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionString() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_String_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java index 8eb8c5aa9a..56a4d9dc1a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java index 4ddf4b4d74..19759e39ca 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; import com.google.logging.v2.LogSinkName; @@ -43,4 +43,4 @@ public static void syncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java index 5800d2bc8b..eb9d8c45af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_Logsinkname_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_Logsinkname_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java index 461e1e00ce..19ccef5c23 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_String_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkString() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_String_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java index 050edd8160..8b92bebeb7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteView_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteView() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteView_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java index b7be382fa1..fe09d90db1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteView_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; import com.google.logging.v2.LogViewName; @@ -46,4 +46,4 @@ public static void syncDeleteView() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteView_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java index b88c0bf58e..4e0599b144 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetBucket_async] +// [START logging_v2_generated_ConfigServiceV2_GetBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; @@ -48,4 +48,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END logging_v2_generated_Config_GetBucket_async] +// [END logging_v2_generated_ConfigServiceV2_GetBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java index 76f8f64dcd..996d6d8d0a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_GetBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; import com.google.logging.v2.LogBucket; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END logging_v2_generated_Config_GetBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_GetBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java index a1a38dbe27..ad161fa1cd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetCmekSettings_async] +// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -46,4 +46,4 @@ public static void asyncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_GetCmekSettings_async] +// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java index cedb4e7bf4..d1cc6edb97 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetCmekSettings_sync] +// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.CmekSettingsName; @@ -43,4 +43,4 @@ public static void syncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_GetCmekSettings_sync] +// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java index 0915b1c70b..cd68cdbd23 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java index 3419efced1..02526a974e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java index 42483f6648..7007f21027 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java index 07b2643c50..9644892476 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_String_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionString() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_String_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java index 851a6d9460..5741024009 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_async] +// [START logging_v2_generated_ConfigServiceV2_GetSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; @@ -46,4 +46,4 @@ public static void asyncGetSink() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_async] +// [END logging_v2_generated_ConfigServiceV2_GetSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java index 6c39d0fe51..5a204ee514 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; import com.google.logging.v2.LogSink; @@ -43,4 +43,4 @@ public static void syncGetSink() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java index 3a4b4ff9d8..69624dd227 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_Logsinkname_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_Logsinkname_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java index 1221c48ce9..d60d3e89fa 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_String_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkString() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_String_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java index 3bfc68cd76..fca576b053 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetView_async] +// [START logging_v2_generated_ConfigServiceV2_GetView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; @@ -49,4 +49,4 @@ public static void asyncGetView() throws Exception { } } } -// [END logging_v2_generated_Config_GetView_async] +// [END logging_v2_generated_ConfigServiceV2_GetView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java index 1c9e3010d7..6162982ac0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetView_sync] +// [START logging_v2_generated_ConfigServiceV2_GetView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncGetView() throws Exception { } } } -// [END logging_v2_generated_Config_GetView_sync] +// [END logging_v2_generated_ConfigServiceV2_GetView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java index f8de847d45..4a415a51e4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_async] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; @@ -50,4 +50,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_async] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java index 438dd1ab4f..abd004d18a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListBucketsRequest; @@ -58,4 +58,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java index 1ceeba8e92..cced74307b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; import com.google.logging.v2.LocationName; @@ -47,4 +47,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java index dc60676d8c..210f92506a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountLocationName; import com.google.logging.v2.LogBucket; @@ -42,4 +42,4 @@ public static void syncListBucketsBillingaccountlocationname() throws Exception } } } -// [END logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java index 08b69d8380..9b964e318c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderLocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsFolderlocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java index e7eef6601c..6eb3c8dccb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Locationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsLocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Locationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java index 80c27cb25c..a8c3d488b5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.OrganizationLocationName; @@ -41,4 +41,4 @@ public static void syncListBucketsOrganizationlocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java index 3dc2e09663..e12f7e109d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java index b5b751e512..9962b6b147 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_async] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; @@ -51,4 +51,4 @@ public static void asyncListExclusions() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_async] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java index dcc315a987..34a44b8418 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListExclusionsRequest; @@ -58,4 +58,4 @@ public static void asyncListExclusionsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java index 50fcbb7413..57efa08b83 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; import com.google.logging.v2.LogExclusion; @@ -47,4 +47,4 @@ public static void syncListExclusions() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java index 9939428ec0..053d366a89 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java index 3008fc13a1..e9a73d3f4f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Foldername_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsFoldername() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Foldername_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java index 457259ff27..db670ab3e1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Organizationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListExclusionsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Organizationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java index 087d4e7241..27142979e0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Projectname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsProjectname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Projectname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java index 29eab9f45b..6f2889389b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java index bf52d0e488..bab6ac1100 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_async] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; @@ -50,4 +50,4 @@ public static void asyncListSinks() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_async] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java index 66fc641d8b..8221ed0e47 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListSinksRequest; @@ -58,4 +58,4 @@ public static void asyncListSinksPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java index 28a7508ada..665b6f1e39 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; import com.google.logging.v2.LogSink; @@ -47,4 +47,4 @@ public static void syncListSinks() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java index f90b7ddf60..41c8f681ef 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Billingaccountname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Billingaccountname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java index ac9330d556..2b7d35ab97 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Foldername_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksFoldername() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Foldername_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java index 110aff10e2..264990af48 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Organizationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListSinksOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Organizationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java index 991cf621c6..e44b6205ca 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Projectname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksProjectname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Projectname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java index 251b54b9cd..52585a2f61 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksString() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java index 5063a7df09..2f50413e92 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_async] +// [START logging_v2_generated_ConfigServiceV2_ListViews_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; @@ -49,4 +49,4 @@ public static void asyncListViews() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_async] +// [END logging_v2_generated_ConfigServiceV2_ListViews_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java index 8e2b30f750..c11f0129e6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListViewsRequest; @@ -57,4 +57,4 @@ public static void asyncListViewsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java index 65ab409b36..b47aa44bce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_sync] +// [START logging_v2_generated_ConfigServiceV2_ListViews_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncListViews() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_sync] +// [END logging_v2_generated_ConfigServiceV2_ListViews_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java index 90d4eb7a3f..e4375e0440 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListViews_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -40,4 +40,4 @@ public static void syncListViewsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListViews_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java index 4ac4f21600..bbc765fad4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UndeleteBucket_async] +// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void asyncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UndeleteBucket_async] +// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java index a6d397c7bb..a701841e37 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UndeleteBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; import com.google.logging.v2.UndeleteBucketRequest; @@ -45,4 +45,4 @@ public static void syncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UndeleteBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java index 2bdf045fef..3b41eca05a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateBucket_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; @@ -51,4 +51,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateBucket_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java index 6bc0a81437..a869306187 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java index 075afc71d9..fd173d5072 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateCmekSettings_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -49,4 +49,4 @@ public static void asyncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateCmekSettings_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java index 066db0f221..f0c7feb985 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateCmekSettings_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.UpdateCmekSettingsRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateCmekSettings_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java index e2c794e348..7b24e77c6f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; @@ -50,4 +50,4 @@ public static void asyncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java index 635ae3138a..5599414833 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -47,4 +47,4 @@ public static void syncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java index 019d31b844..bc402ea94c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionLogexclusionnameLogexclusionFieldmask() th } } } -// [END logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java index 0382f5dd3c..8e20f45a0b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionStringLogexclusionFieldmask() throws Excep } } } -// [END logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java index ab63f731ff..e4d5c91e85 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; @@ -50,4 +50,4 @@ public static void asyncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java index a642e8af7f..af470dcb04 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -47,4 +47,4 @@ public static void syncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java index 8a6d30e840..f74d2c33de 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkLogsinknameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java index 32323d55d3..aec9fbcd1f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkLogsinknameLogsinkFieldmask() throws Exception } } } -// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java index 8e7effd922..902dc0926a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_StringLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_StringLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java index 1c7601f9e8..ff275027c0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkStringLogsinkFieldmask() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java index d184350a61..15c5e06efe 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateView_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -48,4 +48,4 @@ public static void asyncUpdateView() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateView_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java index de3ed279b0..fbe179a735 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateView_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; import com.google.logging.v2.UpdateViewRequest; @@ -45,4 +45,4 @@ public static void syncUpdateView() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateView_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java index d3e7fce859..e816fa00c0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java index cc7769f0b0..8f45174e6d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_Create_SetEndpoint_sync] +// [START logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_Logging_Create_SetEndpoint_sync] +// [END logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java index 65dfbf6fc4..ddfc69170c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_async] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_async] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java index f58e35379b..0f4b8d4815 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.LogName; @@ -43,4 +43,4 @@ public static void syncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java index c12ea2f593..58768449fc 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_Logname_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogLogname() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_Logname_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java index fe86078e27..6322f88684 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_String_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogString() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_String_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java index ef5d7e8ccb..882c03d6ad 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java index 2bfb1b6c3f..f018b6932d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogEntriesRequest; @@ -60,4 +60,4 @@ public static void asyncListLogEntriesPaged() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java index 94861f9571..0809ee3bae 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; import com.google.logging.v2.LogEntry; @@ -49,4 +49,4 @@ public static void syncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java index 94ce4dac9a..0362f54077 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncListLogEntriesListstringStringString() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java index 6152c9cb13..f953d535ba 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; @@ -51,4 +51,4 @@ public static void asyncListLogs() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java index e2b6c24eab..8f1861dbc7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogsRequest; @@ -59,4 +59,4 @@ public static void asyncListLogsPaged() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java index ad9b101fe9..c3f2710ac0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; import com.google.logging.v2.ProjectName; @@ -48,4 +48,4 @@ public static void syncListLogs() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java index ea94e648b7..873f35192b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.BillingAccountName; @@ -40,4 +40,4 @@ public static void syncListLogsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java index 97385d41dc..21f7c3d8f1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Foldername_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.FolderName; @@ -40,4 +40,4 @@ public static void syncListLogsFoldername() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Foldername_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java index f217a490ab..482880b0ea 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Organizationname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncListLogsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Organizationname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java index baeac438a0..56ae4bede8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Projectname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsProjectname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Projectname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java index 343ea0797d..72be8ea87b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_String_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsString() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_String_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java index 0393705c87..7280fad4e7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -49,4 +49,4 @@ public static void asyncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java index a60e62e53f..cfc6c077af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; @@ -57,4 +57,4 @@ public static void asyncListMonitoredResourceDescriptorsPaged() throws Exception } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java index 0240d0ae20..14cc45dc9c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest; @@ -46,4 +46,4 @@ public static void syncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java index 04500ea8a9..cc2ea957f7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_TailLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_TailLogEntries_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.TailLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncTailLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_TailLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_TailLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java index b8aac8db89..35a3265911 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] import com.google.api.MonitoredResource; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -56,4 +56,4 @@ public static void asyncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_WriteLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java index 649f1366b9..8d0b01bf25 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -52,4 +52,4 @@ public static void syncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_WriteLogEntries_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java index 65ba673580..bd79f3dd2e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesLognameMonitoredresourceMapstringstringLis } } } -// [END logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java index d69e7f5f35..830f5c9594 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesStringMonitoredresourceMapstringstringList } } } -// [END logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java index 2b202407d3..01738692f9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java index 74cba5dfc8..34cf57f15c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_Create_SetEndpoint_sync] +// [START logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_Metrics_Create_SetEndpoint_sync] +// [END logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java index bedd6dc546..4de99d41be 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; @@ -47,4 +47,4 @@ public static void asyncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java index f8fd7a6882..1d7b15926b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -44,4 +44,4 @@ public static void syncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java index 25844b26af..a6b645e580 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricProjectnameLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java index 0f3b22f116..55f0d05910 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java index fabe228bf2..9eaddcee33 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java index 5130f428fa..a0af69c351 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; import com.google.logging.v2.LogMetricName; @@ -43,4 +43,4 @@ public static void syncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java index a512881e8f..033de053ff 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java index ac60ed04e7..69d8ab2df7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_String_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricString() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_String_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java index 32808dc48b..8bc22db42e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java index b73437233f..c3054b8c91 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -43,4 +43,4 @@ public static void syncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java index 9fe81972fb..be1612c929 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java index 49336d172d..8d28e37eb5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_String_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricString() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_String_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java index 9baa82c72e..517656c0ec 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_async] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; @@ -50,4 +50,4 @@ public static void asyncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_async] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java index e403a31d81..1cc0315ef1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_Paged_async] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] import com.google.cloud.logging.v2.MetricsClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogMetricsRequest; @@ -58,4 +58,4 @@ public static void asyncListLogMetricsPaged() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_Paged_async] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java index 4cd6c5b24a..d32b3af8e1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void syncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java index c9311ec6f5..f9da7ecb78 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsProjectname() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java index f549e4fcfd..a3e327bf56 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_String_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsString() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_String_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java index b5b805473b..d2c0ac2d2f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void asyncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java index d9ddd5cabf..dd2f105604 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -44,4 +44,4 @@ public static void syncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java index 95afee63f1..656195a4f8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricLogmetricnameLogmetric() throws Exception } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java index 72d5b2a914..c3a8f822d2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java index 2689c5e644..47792ee22d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java index 7a9873e2e1..19398974d1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java index d2e14dd073..74621080e4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_async] +// [START pubsub_v1_generated_Publisher_CreateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; @@ -55,4 +55,4 @@ public static void asyncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_async] +// [END pubsub_v1_generated_Publisher_CreateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java index 40695121e2..a4b5de14e9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.MessageStoragePolicy; @@ -52,4 +52,4 @@ public static void syncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java index c7fbe1a507..c5d7bf9bc2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java index a87e0a41ba..3fe1d8d1ce 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java index 54087a1a06..7333b31068 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_async] +// [START pubsub_v1_generated_Publisher_DeleteTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_async] +// [END pubsub_v1_generated_Publisher_DeleteTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java index 66d3598075..592d02f1e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteTopicRequest; @@ -43,4 +43,4 @@ public static void syncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java index 54c2d3a70d..e38c29ba6c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java index ecfd69242a..d7e2b5ecfb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java index 570b9cba9c..6f476688b0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_async] +// [START pubsub_v1_generated_Publisher_DetachSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_async] +// [END pubsub_v1_generated_Publisher_DetachSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java index 0078b627cc..d246600768 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] +// [START pubsub_v1_generated_Publisher_DetachSubscription_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -43,4 +43,4 @@ public static void syncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] +// [END pubsub_v1_generated_Publisher_DetachSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java index ba611dabba..7811b64d9b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] +// [START pubsub_v1_generated_Publisher_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] +// [END pubsub_v1_generated_Publisher_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java index 469141c01e..22b082ae1d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] +// [START pubsub_v1_generated_Publisher_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] +// [END pubsub_v1_generated_Publisher_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java index 38812517c2..6186bbc7f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_async] +// [START pubsub_v1_generated_Publisher_GetTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; @@ -46,4 +46,4 @@ public static void asyncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_async] +// [END pubsub_v1_generated_Publisher_GetTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java index a33abdc612..dae908367f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.Topic; @@ -43,4 +43,4 @@ public static void syncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java index 8747bad91a..880d718804 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java index e73310c483..f1b638ad0c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java index 20e95874a9..bb5c209e76 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_async] +// [START pubsub_v1_generated_Publisher_ListTopics_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_async] +// [END pubsub_v1_generated_Publisher_ListTopics_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java index cd76f71f61..bc408435bb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopics_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopics_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java index 225852c905..ef06991673 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java index 8a77860953..81bc425073 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java index 7d5cef7204..99bcc8bf29 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java index fe65e4f98c..d443239958 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java index b89916be96..70abfdafec 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java index dbf6f6c855..c09b9310f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java index b8fcb98460..6b1af0211a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java index 143193b422..b049daf378 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java index d81e41eb1f..b4e989dd9d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java index 8e1e6e7443..f58ba30e98 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java index ddacb54ab2..acbe537c50 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java index d3b44f61bb..51cc955ab3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java index 0b7ba70458..c9ca4db89c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java index 7be4c1d4a6..5923a643cc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_async] +// [START pubsub_v1_generated_Publisher_Publish_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; @@ -49,4 +49,4 @@ public static void asyncPublish() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_async] +// [END pubsub_v1_generated_Publisher_Publish_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java index 159a94a8b0..a38c98b0be 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_sync] +// [START pubsub_v1_generated_Publisher_Publish_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; import com.google.pubsub.v1.PublishResponse; @@ -46,4 +46,4 @@ public static void syncPublish() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_sync] +// [END pubsub_v1_generated_Publisher_Publish_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java index 0e293316b5..af9f822ea4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] +// [START pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishStringListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] +// [END pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java index 3ee1c88f3f..8f4cac5379 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] +// [START pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishTopicnameListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] +// [END pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java index a1e5d19d56..7532610f06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] +// [START pubsub_v1_generated_Publisher_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] +// [END pubsub_v1_generated_Publisher_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java index 25a50f9d5a..9bade67c6b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] +// [START pubsub_v1_generated_Publisher_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] +// [END pubsub_v1_generated_Publisher_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java index 2c521262f6..c2718a9def 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] +// [START pubsub_v1_generated_Publisher_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] +// [END pubsub_v1_generated_Publisher_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java index 2dfa13eb66..ab708587bc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] +// [START pubsub_v1_generated_Publisher_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] +// [END pubsub_v1_generated_Publisher_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java index 4a1dc41af9..b9aa104687 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_async] +// [START pubsub_v1_generated_Publisher_UpdateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; @@ -47,4 +47,4 @@ public static void asyncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_async] +// [END pubsub_v1_generated_Publisher_UpdateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java index ea1839364c..83ca0b9f16 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] +// [START pubsub_v1_generated_Publisher_UpdateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Topic; @@ -44,4 +44,4 @@ public static void syncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] +// [END pubsub_v1_generated_Publisher_UpdateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java index 29614b0859..b61fc7b2c6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] +// [START pubsub_v1_generated_Subscriber_Acknowledge_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -48,4 +48,4 @@ public static void asyncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] +// [END pubsub_v1_generated_Subscriber_Acknowledge_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java index 751dfb0d78..5a9ffe0368 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.AcknowledgeRequest; @@ -45,4 +45,4 @@ public static void syncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java index 8cdc60b790..71ca1c00ca 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeStringListstring() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java index c34aa36f1d..23eb8043f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeSubscriptionnameListstring() throws Exception } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java index 9b5057e476..c97f801f0b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java index e23042c9c3..f8b340ee5f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java index 6fbc541b5e..268d565f18 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; @@ -51,4 +51,4 @@ public static void asyncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java index 29edfc51c5..f1025baa61 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -47,4 +47,4 @@ public static void syncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java index 6946725a40..7fe500754d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java index 8411049f9e..cae1578959 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameSubscriptionname() throws Excep } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java index da5863331b..fdf6b8daec 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java index 339814cabe..15bd89cb28 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java index 7d51d4ea88..80d4398dcc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; @@ -67,4 +67,4 @@ public static void asyncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java index 6f9ec0df0f..6f7d3845b6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.DeadLetterPolicy; @@ -63,4 +63,4 @@ public static void syncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java index 04f5007d19..92fa5bfd3e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringStringPushconfigInt() throws Exce } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java index a67223a046..141563b0a6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringTopicnamePushconfigInt() throws E } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java index 574fe47706..bfd8ba0ad2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionSubscriptionnameStringPushconfigInt() t } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java index 4aee56b88d..7028163a76 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -46,4 +46,4 @@ public static void syncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt( } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java index 80b063f2d1..c85d0f4b06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java index dd52f69b52..a807d55be0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java index 4932bb9f6f..5a53e2cf88 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java index eaf04e65ee..a995d22f73 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java index b5b5cd8dab..60c66767e6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java index dad68bcb90..5eba50c9e9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSubscriptionRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java index 4b93510039..95ba167c91 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java index cd58d7c94a..b9af13c79c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java index a4008113c5..454c352c44 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] +// [START pubsub_v1_generated_Subscriber_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] +// [END pubsub_v1_generated_Subscriber_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java index 5f5010cdf0..2a0442533e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] +// [START pubsub_v1_generated_Subscriber_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] +// [END pubsub_v1_generated_Subscriber_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java index b23e6c203a..3683548922 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; @@ -47,4 +47,4 @@ public static void asyncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java index e6b917d600..c3e3815562 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -43,4 +43,4 @@ public static void syncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java index 9089e7a7eb..c31158a3ab 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java index d0b1834191..66ef4b7d19 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java index 5aa661cd09..a6ff85a1fe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] +// [START pubsub_v1_generated_Subscriber_GetSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] +// [END pubsub_v1_generated_Subscriber_GetSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java index af814f76d2..a49256c431 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; import com.google.pubsub.v1.Subscription; @@ -43,4 +43,4 @@ public static void syncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java index 96318e4fb6..311862d3aa 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java index 9139aaea83..7cb6dc3a8d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java index 4bdc239e58..945a3c564b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -51,4 +51,4 @@ public static void asyncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java index 3a2e369ced..6baa3920b1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -59,4 +59,4 @@ public static void asyncListSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java index 6fa3525272..56a4755df7 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java index f17df582c9..ae798c14e5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java index c5c71dcdb8..25651fb030 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java index c80178b90b..a6bca38708 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -51,4 +51,4 @@ public static void asyncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java index 5caf00064a..c07bfa442a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -59,4 +59,4 @@ public static void asyncListSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java index 888b1baf12..efa610bb8c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java index feec6ee394..bce6aabc30 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java index 14e0d0a9e1..d11b3fefc3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java index 62c37591bb..2c80fe321a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -50,4 +50,4 @@ public static void asyncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java index e606d1d958..b3462d25da 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyAckDeadlineRequest; @@ -46,4 +46,4 @@ public static void syncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java index 9c80163831..50afc17d80 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineStringListstringInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java index 0f6c75fb28..9508d6080c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineSubscriptionnameListstringInt() throws E } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java index e4f4b494a9..aa51e8dc59 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -49,4 +49,4 @@ public static void asyncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java index 4b98fffbf3..a6fbb2a8de 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyPushConfigRequest; @@ -45,4 +45,4 @@ public static void syncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java index 9d10bea2aa..71642d3a42 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigStringPushconfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java index a158e59cc0..f65ac93e46 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigSubscriptionnamePushconfig() throws Excep } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java index f947a915b5..4ab60d852d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_async] +// [START pubsub_v1_generated_Subscriber_Pull_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; @@ -48,4 +48,4 @@ public static void asyncPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_async] +// [END pubsub_v1_generated_Subscriber_Pull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java index c1a1079c5d..8bed94fe25 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_sync] +// [START pubsub_v1_generated_Subscriber_Pull_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; import com.google.pubsub.v1.PullResponse; @@ -45,4 +45,4 @@ public static void syncPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_sync] +// [END pubsub_v1_generated_Subscriber_Pull_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java index bf9f3708ef..ae23e170c9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullStringBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java index 33f0db5f86..19bb1784a2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_StringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullStringInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_StringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java index 48adb74d45..9ade351b72 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullSubscriptionnameBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java index 5062165713..61a62b6a2f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullSubscriptionnameInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java index 55212dd97d..c3641d8473 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Seek_async] +// [START pubsub_v1_generated_Subscriber_Seek_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; @@ -46,4 +46,4 @@ public static void asyncSeek() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Seek_async] +// [END pubsub_v1_generated_Subscriber_Seek_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java index 70a99a9ef7..6ff5634e7f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Seek_sync] +// [START pubsub_v1_generated_Subscriber_Seek_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; import com.google.pubsub.v1.SeekResponse; @@ -43,4 +43,4 @@ public static void syncSeek() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Seek_sync] +// [END pubsub_v1_generated_Subscriber_Seek_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java index ac7cb04a37..d24e119bbd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] +// [START pubsub_v1_generated_Subscriber_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] +// [END pubsub_v1_generated_Subscriber_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java index 38453850c6..9c3b9b27e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] +// [START pubsub_v1_generated_Subscriber_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] +// [END pubsub_v1_generated_Subscriber_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java index 72baf12607..eac398483f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] +// [START pubsub_v1_generated_Subscriber_StreamingPull_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.StreamingPullRequest; @@ -57,4 +57,4 @@ public static void asyncStreamingPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] +// [END pubsub_v1_generated_Subscriber_StreamingPull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java index 8cd6983fa8..2060857ad6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] +// [START pubsub_v1_generated_Subscriber_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] +// [END pubsub_v1_generated_Subscriber_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java index b412b30fbb..e25ec0d84b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] +// [START pubsub_v1_generated_Subscriber_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] +// [END pubsub_v1_generated_Subscriber_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java index 36ce3fd425..16fadb5d46 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] +// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] +// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java index 742fd2aeb5..fce6a9df70 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Snapshot; @@ -44,4 +44,4 @@ public static void syncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java index 0d442b959b..1e3fbd18f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] +// [START pubsub_v1_generated_Subscriber_UpdateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] +// [END pubsub_v1_generated_Subscriber_UpdateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java index c4ec8bfe5f..517495e7a4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] +// [START pubsub_v1_generated_Subscriber_UpdateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Subscription; @@ -44,4 +44,4 @@ public static void syncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] +// [END pubsub_v1_generated_Subscriber_UpdateSubscription_sync] From 63b9bcedbfd7c9cf944869581125404d24a33ec9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 20:29:53 -0700 Subject: [PATCH 064/103] chore(main): release 2.10.3 (#1079) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ version.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069098dbe2..5c3772c261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.10.3](https://github.com/googleapis/gapic-generator-java/compare/v2.10.2...v2.10.3) (2022-11-01) + + +### Bug Fixes + +* Fix REST transport client creation generated javadoc sample ([#1077](https://github.com/googleapis/gapic-generator-java/issues/1077)) ([9ac0ca8](https://github.com/googleapis/gapic-generator-java/commit/9ac0ca80b09077f7880f0029b5d7b090a10a10b8)) +* Fixes regionTag breakage ([#1068](https://github.com/googleapis/gapic-generator-java/issues/1068)) ([bed9f72](https://github.com/googleapis/gapic-generator-java/commit/bed9f721fbafb5f2e974b6f43f8455f2fdb581f7)) + ## [2.10.2](https://github.com/googleapis/gapic-generator-java/compare/v2.10.1...v2.10.2) (2022-10-24) diff --git a/version.txt b/version.txt index c6436a8536..5f4f65c859 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.10.2 +2.10.3 From 9e4721f6d212d67597bfa8cbba9048146ba063be Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 3 Nov 2022 09:44:51 -0400 Subject: [PATCH 065/103] fix(ast): add import generation for annotations on VariableExpr (#1076) * This PR is a follow-up patch to #1012 which added support for annotations on VariableExpr. It updates ImportWriterVisitor so that import generation also covers these annotations. --- .../engine/writer/ImportWriterVisitor.java | 1 + .../writer/ImportWriterVisitorTest.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java b/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java index 0967cea087..b3b2c9d997 100644 --- a/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java +++ b/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java @@ -183,6 +183,7 @@ public void visit(TernaryExpr ternaryExpr) { @Override public void visit(VariableExpr variableExpr) { variableExpr.variable().type().accept(this); + annotations(variableExpr.annotations()); if (variableExpr.exprReferenceExpr() != null) { variableExpr.exprReferenceExpr().accept(this); } diff --git a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java index 07be47a996..bd8d62afb7 100644 --- a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java +++ b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java @@ -363,6 +363,32 @@ public void writeVariableExprImports_nestedReference() { writerVisitor.write()); } + @Test + public void writeVariableExprImports_withAnnotations() { + Variable variable = + Variable.builder() + .setName("expr") + .setType(TypeNode.withReference(ConcreteReference.withClazz(Expr.class))) + .build(); + + VariableExpr variableExpr = + VariableExpr.builder() + .setVariable(variable) + .setIsDecl(true) + .setAnnotations( + Arrays.asList( + AnnotationNode.withType( + TypeNode.withReference(ConcreteReference.withClazz(Generated.class))))) + .build(); + + variableExpr.accept(writerVisitor); + assertEquals( + LineFormatter.lines( + "import com.google.api.generator.engine.ast.Expr;\n", + "import javax.annotation.Generated;\n\n"), + writerVisitor.write()); + } + @Test public void writeAnonymousClassExprImports() { // [Constructing] Function, MethodDefinition> From 0bbfc5988768081c5fbb32d5cb36d78fdaf9d9aa Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 3 Nov 2022 10:35:57 -0400 Subject: [PATCH 066/103] test: update golden files after annotations import fix --- .../spring/composer/goldens/EchoSpringAutoConfiguration.golden | 1 + .../composer/goldens/EchoSpringAutoConfigurationFull.golden | 1 + .../spring/composer/goldens/EchoSpringProperties.golden | 1 + .../spring/composer/goldens/EchoSpringPropertiesFull.golden | 1 + 4 files changed, 4 insertions(+) diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index 6800a70f8c..7b71d337b7 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -11,6 +11,7 @@ import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 25df0158b4..b3258c0daf 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -29,6 +29,7 @@ import java.io.IOException; import javax.annotation.Generated; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden index 5fe2406751..05d848fe26 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -3,6 +3,7 @@ package com.google.showcase.v1beta1.spring; import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index c0a5400e7e..4d3ab98065 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -21,6 +21,7 @@ import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import javax.annotation.Generated; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @Generated("by gapic-generator-java") From a8dfd8092536d5558dcd2ce28777fe7e0579b64b Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 3 Nov 2022 14:10:08 -0400 Subject: [PATCH 067/103] fix: Revert "chore: merge main into autoconfig-gen-draft2" (#1083) * Revert "test: update golden files after annotations import fix" This reverts commit 0bbfc5988768081c5fbb32d5cb36d78fdaf9d9aa. * Revert "fix(ast): add import generation for annotations on VariableExpr (#1076)" This reverts commit 9e4721f6d212d67597bfa8cbba9048146ba063be. * Revert "chore(main): release 2.10.3 (#1079)" This reverts commit 63b9bcedbfd7c9cf944869581125404d24a33ec9. * Revert "fix: fixes regionTag breakage (#1068)" This reverts commit cd35be87e569101ab0181e43799a31805c387503. * Revert "fix: fix REST transport client creation generated javadoc sample (#1077)" This reverts commit 5346eefb166b89ca96b22bf613eb902e16935eee. * Revert "refactor: expose parsed api short name and version as fields in Service (#1075)" This reverts commit 2ebe94874699fa99520ddbb3231c8c72821944df. * Revert "chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072)" This reverts commit 67742450039173681bf4e22f70f2bcbc20581261. * Revert "chore(main): release 2.10.2 (#1067)" This reverts commit e8ee82f0d61f8d798c46f962c5afe558dcf4f759. * Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 (#1063)" This reverts commit aa1782da8730d961e92682665da50faad23b5c88. * Revert "fix: update regionTag to use service name (#1047)" This reverts commit 38010fd0ad251b69695c997bd6df692565739401. * Revert "chore(main): release 2.10.1 (#1036)" This reverts commit 3282e0fd9e43c597b5bc55de2af50f3b24ba8e0f. * Revert "deps: Upgrade protobuf to 3.21.7 (#1048)" This reverts commit c768691615c2abaec8dd9e98e4e2e76e47baac32. * Revert "fix: update sample region tag to parse host instead of proto package (#1040)" This reverts commit eb94f307693c02f709d10b454a22d3d773869828. * Revert "chore(deps): update dependency com.google.auto.value:auto-value to v1.10 (#1058)" This reverts commit bd5599f4cc1544ad9c57fd8519707795fdf959ef. * Revert "fix: Get numeric value for Enum fields if it is configured as query param or path param (#1042)" This reverts commit 4b5eadb343c90c988e4bcec24e17dc17a6ee5964. * Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 (#1050)" This reverts commit e58bf9de34905ae644c5a91bd81a7d16e31e4c77. * Revert "fix(deps): update dependency org.yaml:snakeyaml to v1.33 (#1043)" This reverts commit d6153055f6746192bd5f27335e7995a62d590f61. * Revert "chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 (#1038)" This reverts commit ce93705b68f2bbe20512d8de718859a5437153c4. * Revert "fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 (#1039)" This reverts commit dba69f494a45110431a2a2d7f4826f2e1074685a. * Revert "fix(deps): update dependency org.yaml:snakeyaml to v1.32 (#1037)" This reverts commit e754a7ccdd212c1b09bf458ad1b1a56e260f01e2. --- CHANGELOG.md | 29 -- PROPERTIES.bzl | 4 +- pom.xml | 10 +- .../engine/writer/ImportWriterVisitor.java | 1 - .../generator/gapic/composer/Composer.java | 51 ++-- .../AbstractServiceClientClassComposer.java | 43 +-- .../AbstractServiceSettingsClassComposer.java | 4 +- ...tractServiceStubSettingsClassComposer.java | 4 +- .../grpcrest/ServiceClientClassComposer.java | 8 +- .../HttpJsonServiceStubClassComposer.java | 25 +- ...iceClientCallableMethodSampleComposer.java | 60 ++-- .../ServiceClientHeaderSampleComposer.java | 58 ++-- .../ServiceClientMethodSampleComposer.java | 35 +-- .../samplecode/SettingsSampleComposer.java | 1 - .../gapic/composer/utils/ClassNames.java | 3 +- .../api/generator/gapic/model/GapicClass.java | 23 +- .../generator/gapic/model/HttpBindings.java | 45 +-- .../api/generator/gapic/model/RegionTag.java | 6 +- .../api/generator/gapic/model/Service.java | 47 ---- .../gapic/protoparser/HttpRuleParser.java | 11 +- .../writer/ImportWriterVisitorTest.java | 26 -- .../gapic/composer/ComposerTest.java | 104 +++---- .../grpc/ServiceClientClassComposerTest.java | 46 +--- .../ServiceSettingsClassComposerTest.java | 22 +- .../grpc/ServiceStubClassComposerTest.java | 12 +- .../ServiceStubSettingsClassComposerTest.java | 36 +-- .../bookshopclient/AsyncGetBook.golden | 4 +- .../SyncCreateSetCredentialsProvider.golden | 4 +- .../SyncCreateSetEndpoint.golden | 4 +- .../samples/bookshopclient/SyncGetBook.golden | 4 +- .../SyncGetBookIntListbook.golden | 4 +- .../SyncGetBookStringListbook.golden | 4 +- .../AsyncFastFibonacci.golden | 4 +- .../AsyncSlowFibonacci.golden | 4 +- .../SyncCreateSetCredentialsProvider.golden | 4 +- .../SyncCreateSetEndpoint.golden | 4 +- .../SyncFastFibonacci.golden | 4 +- .../SyncSlowFibonacci.golden | 4 +- .../samples/echoclient/AsyncBlock.golden | 4 +- .../samples/echoclient/AsyncChat.golden | 4 +- .../samples/echoclient/AsyncChatAgain.golden | 4 +- .../samples/echoclient/AsyncCollect.golden | 4 +- .../echoclient/AsyncCollideName.golden | 4 +- .../samples/echoclient/AsyncEcho.golden | 4 +- .../samples/echoclient/AsyncExpand.golden | 4 +- .../echoclient/AsyncPagedExpand.golden | 4 +- .../echoclient/AsyncPagedExpandPaged.golden | 4 +- .../echoclient/AsyncSimplePagedExpand.golden | 4 +- .../AsyncSimplePagedExpandPaged.golden | 4 +- .../samples/echoclient/AsyncWait.golden | 4 +- .../samples/echoclient/AsyncWaitLRO.golden | 4 +- .../samples/echoclient/SyncBlock.golden | 4 +- .../samples/echoclient/SyncCollideName.golden | 4 +- .../SyncCreateSetCredentialsProvider.golden | 4 +- .../echoclient/SyncCreateSetEndpoint.golden | 4 +- .../samples/echoclient/SyncEcho.golden | 4 +- .../echoclient/SyncEchoFoobarname.golden | 4 +- .../samples/echoclient/SyncEchoNoargs.golden | 4 +- .../echoclient/SyncEchoResourcename.golden | 4 +- .../samples/echoclient/SyncEchoStatus.golden | 4 +- .../samples/echoclient/SyncEchoString.golden | 4 +- .../samples/echoclient/SyncEchoString1.golden | 4 +- .../samples/echoclient/SyncEchoString2.golden | 4 +- .../echoclient/SyncEchoStringSeverity.golden | 4 +- .../samples/echoclient/SyncPagedExpand.golden | 4 +- .../echoclient/SyncSimplePagedExpand.golden | 4 +- .../SyncSimplePagedExpandNoargs.golden | 4 +- .../samples/echoclient/SyncWait.golden | 4 +- .../echoclient/SyncWaitDuration.golden | 4 +- .../echoclient/SyncWaitTimestamp.golden | 4 +- .../identityclient/AsyncCreateUser.golden | 4 +- .../identityclient/AsyncDeleteUser.golden | 4 +- .../identityclient/AsyncGetUser.golden | 4 +- .../identityclient/AsyncListUsers.golden | 4 +- .../identityclient/AsyncListUsersPaged.golden | 4 +- .../identityclient/AsyncUpdateUser.golden | 4 +- .../SyncCreateSetCredentialsProvider.golden | 4 +- .../SyncCreateSetEndpoint.golden | 4 +- .../identityclient/SyncCreateUser.golden | 4 +- .../SyncCreateUserStringStringString.golden | 4 +- ...gStringStringIntStringBooleanDouble.golden | 4 +- ...ngStringIntStringStringStringString.golden | 4 +- .../identityclient/SyncDeleteUser.golden | 4 +- .../SyncDeleteUserString.golden | 4 +- .../SyncDeleteUserUsername.golden | 4 +- .../samples/identityclient/SyncGetUser.golden | 4 +- .../identityclient/SyncGetUserString.golden | 4 +- .../identityclient/SyncGetUserUsername.golden | 4 +- .../identityclient/SyncListUsers.golden | 4 +- .../identityclient/SyncUpdateUser.golden | 4 +- .../messagingclient/AsyncConnect.golden | 4 +- .../messagingclient/AsyncCreateBlurb.golden | 4 +- .../messagingclient/AsyncCreateRoom.golden | 4 +- .../messagingclient/AsyncDeleteBlurb.golden | 4 +- .../messagingclient/AsyncDeleteRoom.golden | 4 +- .../messagingclient/AsyncGetBlurb.golden | 4 +- .../messagingclient/AsyncGetRoom.golden | 4 +- .../messagingclient/AsyncListBlurbs.golden | 4 +- .../AsyncListBlurbsPaged.golden | 4 +- .../messagingclient/AsyncListRooms.golden | 4 +- .../AsyncListRoomsPaged.golden | 4 +- .../messagingclient/AsyncSearchBlurbs.golden | 4 +- .../AsyncSearchBlurbsLRO.golden | 4 +- .../messagingclient/AsyncSendBlurbs.golden | 4 +- .../messagingclient/AsyncStreamBlurbs.golden | 4 +- .../messagingclient/AsyncUpdateBlurb.golden | 4 +- .../messagingclient/AsyncUpdateRoom.golden | 4 +- .../messagingclient/SyncCreateBlurb.golden | 4 +- ...yncCreateBlurbProfilenameBytestring.golden | 4 +- .../SyncCreateBlurbProfilenameString.golden | 4 +- .../SyncCreateBlurbRoomnameBytestring.golden | 4 +- .../SyncCreateBlurbRoomnameString.golden | 4 +- .../SyncCreateBlurbStringBytestring.golden | 4 +- .../SyncCreateBlurbStringString.golden | 4 +- .../messagingclient/SyncCreateRoom.golden | 4 +- .../SyncCreateRoomStringString.golden | 4 +- .../SyncCreateSetCredentialsProvider.golden | 4 +- .../SyncCreateSetEndpoint.golden | 4 +- .../messagingclient/SyncDeleteBlurb.golden | 4 +- .../SyncDeleteBlurbBlurbname.golden | 4 +- .../SyncDeleteBlurbString.golden | 4 +- .../messagingclient/SyncDeleteRoom.golden | 4 +- .../SyncDeleteRoomRoomname.golden | 4 +- .../SyncDeleteRoomString.golden | 4 +- .../messagingclient/SyncGetBlurb.golden | 4 +- .../SyncGetBlurbBlurbname.golden | 4 +- .../messagingclient/SyncGetBlurbString.golden | 4 +- .../messagingclient/SyncGetRoom.golden | 4 +- .../SyncGetRoomRoomname.golden | 4 +- .../messagingclient/SyncGetRoomString.golden | 4 +- .../messagingclient/SyncListBlurbs.golden | 4 +- .../SyncListBlurbsProfilename.golden | 4 +- .../SyncListBlurbsRoomname.golden | 4 +- .../SyncListBlurbsString.golden | 4 +- .../messagingclient/SyncListRooms.golden | 4 +- .../messagingclient/SyncSearchBlurbs.golden | 4 +- .../SyncSearchBlurbsString.golden | 4 +- .../messagingclient/SyncUpdateBlurb.golden | 4 +- .../messagingclient/SyncUpdateRoom.golden | 4 +- .../samples/servicesettings/SyncEcho.golden | 4 +- .../servicesettings/SyncFastFibonacci.golden | 4 +- .../stub/SyncCreateTopic.golden | 4 +- .../servicesettings/stub/SyncDeleteLog.golden | 4 +- .../servicesettings/stub/SyncEcho.golden | 4 +- .../stub/SyncFastFibonacci.golden | 4 +- .../grpcrest/goldens/EchoClient.golden | 6 +- .../grpcrest/goldens/EchoEmpty.golden | 6 +- .../HttpJsonServiceStubClassComposerTest.java | 61 +---- .../rest/goldens/ComplianceClientTest.golden | 98 ------- .../rest/goldens/ComplianceSettings.golden | 20 -- .../goldens/ComplianceStubSettings.golden | 50 +--- .../goldens/HttpJsonComplianceStub.golden | 97 +------ .../samplecode/SampleCodeWriterTest.java | 4 +- .../samplecode/SampleComposerTest.java | 16 +- ...lientCallableMethodSampleComposerTest.java | 258 ++---------------- ...ServiceClientHeaderSampleComposerTest.java | 109 +------- ...ServiceClientMethodSampleComposerTest.java | 80 +----- .../gapic/model/HttpBindingsTest.java | 99 ------- .../api/generator/gapic/model/MethodTest.java | 2 +- .../generator/gapic/model/RegionTagTest.java | 8 +- .../generator/gapic/model/ServiceTest.java | 75 ----- .../gapic/protoparser/HttpRuleParserTest.java | 83 ------ .../EchoSpringAutoConfiguration.golden | 1 - .../EchoSpringAutoConfigurationFull.golden | 1 - .../goldens/EchoSpringProperties.golden | 1 - .../goldens/EchoSpringPropertiesFull.golden | 1 - src/test/proto/compliance.proto | 38 --- src/test/proto/http_rule_parser_testing.proto | 63 ----- .../AsyncAnalyzeIamPolicy.java | 4 +- .../SyncAnalyzeIamPolicy.java | 4 +- .../AsyncAnalyzeIamPolicyLongrunning.java | 4 +- .../AsyncAnalyzeIamPolicyLongrunningLRO.java | 4 +- .../SyncAnalyzeIamPolicyLongrunning.java | 4 +- .../analyzemove/AsyncAnalyzeMove.java | 4 +- .../analyzemove/SyncAnalyzeMove.java | 4 +- .../AsyncBatchGetAssetsHistory.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createfeed/AsyncCreateFeed.java | 4 +- .../createfeed/SyncCreateFeed.java | 4 +- .../createfeed/SyncCreateFeedString.java | 4 +- .../deletefeed/AsyncDeleteFeed.java | 4 +- .../deletefeed/SyncDeleteFeed.java | 4 +- .../deletefeed/SyncDeleteFeedFeedname.java | 4 +- .../deletefeed/SyncDeleteFeedString.java | 4 +- .../exportassets/AsyncExportAssets.java | 4 +- .../exportassets/AsyncExportAssetsLRO.java | 4 +- .../exportassets/SyncExportAssets.java | 4 +- .../getfeed/AsyncGetFeed.java | 4 +- .../getfeed/SyncGetFeed.java | 4 +- .../getfeed/SyncGetFeedFeedname.java | 4 +- .../getfeed/SyncGetFeedString.java | 4 +- .../listassets/AsyncListAssets.java | 4 +- .../listassets/AsyncListAssetsPaged.java | 4 +- .../listassets/SyncListAssets.java | 4 +- .../SyncListAssetsResourcename.java | 4 +- .../listassets/SyncListAssetsString.java | 4 +- .../listfeeds/AsyncListFeeds.java | 4 +- .../listfeeds/SyncListFeeds.java | 4 +- .../listfeeds/SyncListFeedsString.java | 4 +- .../AsyncSearchAllIamPolicies.java | 4 +- .../AsyncSearchAllIamPoliciesPaged.java | 4 +- .../SyncSearchAllIamPolicies.java | 4 +- .../SyncSearchAllIamPoliciesStringString.java | 4 +- .../AsyncSearchAllResources.java | 4 +- .../AsyncSearchAllResourcesPaged.java | 4 +- .../SyncSearchAllResources.java | 4 +- ...rchAllResourcesStringStringListstring.java | 4 +- .../updatefeed/AsyncUpdateFeed.java | 4 +- .../updatefeed/SyncUpdateFeed.java | 4 +- .../updatefeed/SyncUpdateFeedFeed.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../SyncBatchGetAssetsHistory.java | 4 +- .../AsyncCheckAndMutateRow.java | 4 +- .../SyncCheckAndMutateRow.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../mutaterow/AsyncMutateRow.java | 4 +- .../mutaterow/SyncMutateRow.java | 4 +- ...MutateRowStringBytestringListmutation.java | 4 +- ...RowStringBytestringListmutationString.java | 4 +- ...ateRowTablenameBytestringListmutation.java | 4 +- ...TablenameBytestringListmutationString.java | 4 +- .../mutaterows/AsyncMutateRows.java | 4 +- .../AsyncReadModifyWriteRow.java | 4 +- .../SyncReadModifyWriteRow.java | 4 +- ...ringBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- ...nameBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- .../readrows/AsyncReadRows.java | 4 +- .../samplerowkeys/AsyncSampleRowKeys.java | 4 +- .../mutaterow/SyncMutateRow.java | 4 +- .../mutaterow/SyncMutateRow.java | 4 +- .../aggregatedlist/AsyncAggregatedList.java | 4 +- .../AsyncAggregatedListPaged.java | 4 +- .../aggregatedlist/SyncAggregatedList.java | 4 +- .../SyncAggregatedListString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../delete/AsyncDelete.java | 4 +- .../delete/AsyncDeleteLRO.java | 4 +- .../delete/SyncDelete.java | 4 +- .../delete/SyncDeleteStringStringString.java | 4 +- .../insert/AsyncInsert.java | 4 +- .../insert/AsyncInsertLRO.java | 4 +- .../insert/SyncInsert.java | 4 +- .../insert/SyncInsertStringStringAddress.java | 4 +- .../list/AsyncList.java | 4 +- .../list/AsyncListPaged.java | 4 +- .../list/SyncList.java | 4 +- .../list/SyncListStringStringString.java | 4 +- .../aggregatedlist/SyncAggregatedList.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../get/AsyncGet.java | 4 +- .../get/SyncGet.java | 4 +- .../get/SyncGetStringStringString.java | 4 +- .../wait/AsyncWait.java | 4 +- .../wait/SyncWait.java | 4 +- .../wait/SyncWaitStringStringString.java | 4 +- .../regionoperationssettings/get/SyncGet.java | 4 +- .../aggregatedlist/SyncAggregatedList.java | 4 +- .../get/SyncGet.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../AsyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- ...countnameListstringListstringDuration.java | 4 +- ...kenStringListstringListstringDuration.java | 4 +- .../generateidtoken/AsyncGenerateIdToken.java | 4 +- .../generateidtoken/SyncGenerateIdToken.java | 4 +- ...iceaccountnameListstringStringBoolean.java | 4 +- ...eIdTokenStringListstringStringBoolean.java | 4 +- .../signblob/AsyncSignBlob.java | 4 +- .../signblob/SyncSignBlob.java | 4 +- ...erviceaccountnameListstringBytestring.java | 4 +- ...yncSignBlobStringListstringBytestring.java | 4 +- .../signjwt/AsyncSignJwt.java | 4 +- .../signjwt/SyncSignJwt.java | 4 +- ...JwtServiceaccountnameListstringString.java | 4 +- .../SyncSignJwtStringListstringString.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncAsymmetricDecrypt.java | 4 +- .../SyncAsymmetricDecrypt.java | 4 +- ...DecryptCryptokeyversionnameBytestring.java | 4 +- ...SyncAsymmetricDecryptStringBytestring.java | 4 +- .../asymmetricsign/AsyncAsymmetricSign.java | 4 +- .../asymmetricsign/SyncAsymmetricSign.java | 4 +- ...mmetricSignCryptokeyversionnameDigest.java | 4 +- .../SyncAsymmetricSignStringDigest.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createcryptokey/AsyncCreateCryptoKey.java | 4 +- .../createcryptokey/SyncCreateCryptoKey.java | 4 +- ...teCryptoKeyKeyringnameStringCryptokey.java | 4 +- ...cCreateCryptoKeyStringStringCryptokey.java | 4 +- .../AsyncCreateCryptoKeyVersion.java | 4 +- .../SyncCreateCryptoKeyVersion.java | 4 +- ...yVersionCryptokeynameCryptokeyversion.java | 4 +- ...ryptoKeyVersionStringCryptokeyversion.java | 4 +- .../createimportjob/AsyncCreateImportJob.java | 4 +- .../createimportjob/SyncCreateImportJob.java | 4 +- ...teImportJobKeyringnameStringImportjob.java | 4 +- ...cCreateImportJobStringStringImportjob.java | 4 +- .../createkeyring/AsyncCreateKeyRing.java | 4 +- .../createkeyring/SyncCreateKeyRing.java | 4 +- ...reateKeyRingLocationnameStringKeyring.java | 4 +- .../SyncCreateKeyRingStringStringKeyring.java | 4 +- .../decrypt/AsyncDecrypt.java | 4 +- .../decrypt/SyncDecrypt.java | 4 +- .../SyncDecryptCryptokeynameBytestring.java | 4 +- .../decrypt/SyncDecryptStringBytestring.java | 4 +- .../AsyncDestroyCryptoKeyVersion.java | 4 +- .../SyncDestroyCryptoKeyVersion.java | 4 +- ...yCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncDestroyCryptoKeyVersionString.java | 4 +- .../encrypt/AsyncEncrypt.java | 4 +- .../encrypt/SyncEncrypt.java | 4 +- .../SyncEncryptResourcenameBytestring.java | 4 +- .../encrypt/SyncEncryptStringBytestring.java | 4 +- .../getcryptokey/AsyncGetCryptoKey.java | 4 +- .../getcryptokey/SyncGetCryptoKey.java | 4 +- .../SyncGetCryptoKeyCryptokeyname.java | 4 +- .../getcryptokey/SyncGetCryptoKeyString.java | 4 +- .../AsyncGetCryptoKeyVersion.java | 4 +- .../SyncGetCryptoKeyVersion.java | 4 +- ...tCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncGetCryptoKeyVersionString.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getimportjob/AsyncGetImportJob.java | 4 +- .../getimportjob/SyncGetImportJob.java | 4 +- .../SyncGetImportJobImportjobname.java | 4 +- .../getimportjob/SyncGetImportJobString.java | 4 +- .../getkeyring/AsyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRingKeyringname.java | 4 +- .../getkeyring/SyncGetKeyRingString.java | 4 +- .../getlocation/AsyncGetLocation.java | 4 +- .../getlocation/SyncGetLocation.java | 4 +- .../getpublickey/AsyncGetPublicKey.java | 4 +- .../getpublickey/SyncGetPublicKey.java | 4 +- .../SyncGetPublicKeyCryptokeyversionname.java | 4 +- .../getpublickey/SyncGetPublicKeyString.java | 4 +- .../AsyncImportCryptoKeyVersion.java | 4 +- .../SyncImportCryptoKeyVersion.java | 4 +- .../listcryptokeys/AsyncListCryptoKeys.java | 4 +- .../AsyncListCryptoKeysPaged.java | 4 +- .../listcryptokeys/SyncListCryptoKeys.java | 4 +- .../SyncListCryptoKeysKeyringname.java | 4 +- .../SyncListCryptoKeysString.java | 4 +- .../AsyncListCryptoKeyVersions.java | 4 +- .../AsyncListCryptoKeyVersionsPaged.java | 4 +- .../SyncListCryptoKeyVersions.java | 4 +- ...yncListCryptoKeyVersionsCryptokeyname.java | 4 +- .../SyncListCryptoKeyVersionsString.java | 4 +- .../listimportjobs/AsyncListImportJobs.java | 4 +- .../AsyncListImportJobsPaged.java | 4 +- .../listimportjobs/SyncListImportJobs.java | 4 +- .../SyncListImportJobsKeyringname.java | 4 +- .../SyncListImportJobsString.java | 4 +- .../listkeyrings/AsyncListKeyRings.java | 4 +- .../listkeyrings/AsyncListKeyRingsPaged.java | 4 +- .../listkeyrings/SyncListKeyRings.java | 4 +- .../SyncListKeyRingsLocationname.java | 4 +- .../listkeyrings/SyncListKeyRingsString.java | 4 +- .../listlocations/AsyncListLocations.java | 4 +- .../AsyncListLocationsPaged.java | 4 +- .../listlocations/SyncListLocations.java | 4 +- .../AsyncRestoreCryptoKeyVersion.java | 4 +- .../SyncRestoreCryptoKeyVersion.java | 4 +- ...eCryptoKeyVersionCryptokeyversionname.java | 4 +- .../SyncRestoreCryptoKeyVersionString.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatecryptokey/AsyncUpdateCryptoKey.java | 4 +- .../updatecryptokey/SyncUpdateCryptoKey.java | 4 +- ...SyncUpdateCryptoKeyCryptokeyFieldmask.java | 4 +- .../AsyncUpdateCryptoKeyPrimaryVersion.java | 4 +- .../SyncUpdateCryptoKeyPrimaryVersion.java | 4 +- ...oKeyPrimaryVersionCryptokeynameString.java | 4 +- ...teCryptoKeyPrimaryVersionStringString.java | 4 +- .../AsyncUpdateCryptoKeyVersion.java | 4 +- .../SyncUpdateCryptoKeyVersion.java | 4 +- ...toKeyVersionCryptokeyversionFieldmask.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../getkeyring/SyncGetKeyRing.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbook/AsyncCreateBook.java | 4 +- .../createbook/SyncCreateBook.java | 4 +- .../SyncCreateBookShelfnameBook.java | 4 +- .../createbook/SyncCreateBookStringBook.java | 4 +- .../createshelf/AsyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelfShelf.java | 4 +- .../deletebook/AsyncDeleteBook.java | 4 +- .../deletebook/SyncDeleteBook.java | 4 +- .../deletebook/SyncDeleteBookBookname.java | 4 +- .../deletebook/SyncDeleteBookString.java | 4 +- .../deleteshelf/AsyncDeleteShelf.java | 4 +- .../deleteshelf/SyncDeleteShelf.java | 4 +- .../deleteshelf/SyncDeleteShelfShelfname.java | 4 +- .../deleteshelf/SyncDeleteShelfString.java | 4 +- .../getbook/AsyncGetBook.java | 4 +- .../getbook/SyncGetBook.java | 4 +- .../getbook/SyncGetBookBookname.java | 4 +- .../getbook/SyncGetBookString.java | 4 +- .../getshelf/AsyncGetShelf.java | 4 +- .../getshelf/SyncGetShelf.java | 4 +- .../getshelf/SyncGetShelfShelfname.java | 4 +- .../getshelf/SyncGetShelfString.java | 4 +- .../listbooks/AsyncListBooks.java | 4 +- .../listbooks/AsyncListBooksPaged.java | 4 +- .../listbooks/SyncListBooks.java | 4 +- .../listbooks/SyncListBooksShelfname.java | 4 +- .../listbooks/SyncListBooksString.java | 4 +- .../listshelves/AsyncListShelves.java | 4 +- .../listshelves/AsyncListShelvesPaged.java | 4 +- .../listshelves/SyncListShelves.java | 4 +- .../mergeshelves/AsyncMergeShelves.java | 4 +- .../mergeshelves/SyncMergeShelves.java | 4 +- .../SyncMergeShelvesShelfnameShelfname.java | 4 +- .../SyncMergeShelvesShelfnameString.java | 4 +- .../SyncMergeShelvesStringShelfname.java | 4 +- .../SyncMergeShelvesStringString.java | 4 +- .../movebook/AsyncMoveBook.java | 4 +- .../movebook/SyncMoveBook.java | 4 +- .../SyncMoveBookBooknameShelfname.java | 4 +- .../movebook/SyncMoveBookBooknameString.java | 4 +- .../movebook/SyncMoveBookStringShelfname.java | 4 +- .../movebook/SyncMoveBookStringString.java | 4 +- .../updatebook/AsyncUpdateBook.java | 4 +- .../updatebook/SyncUpdateBook.java | 4 +- .../SyncUpdateBookBookFieldmask.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- .../createshelf/SyncCreateShelf.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbucket/AsyncCreateBucket.java | 4 +- .../createbucket/SyncCreateBucket.java | 4 +- .../createexclusion/AsyncCreateExclusion.java | 4 +- .../createexclusion/SyncCreateExclusion.java | 4 +- ...clusionBillingaccountnameLogexclusion.java | 4 +- ...CreateExclusionFoldernameLogexclusion.java | 4 +- ...ExclusionOrganizationnameLogexclusion.java | 4 +- ...reateExclusionProjectnameLogexclusion.java | 4 +- ...SyncCreateExclusionStringLogexclusion.java | 4 +- .../createsink/AsyncCreateSink.java | 4 +- .../createsink/SyncCreateSink.java | 4 +- ...ncCreateSinkBillingaccountnameLogsink.java | 4 +- .../SyncCreateSinkFoldernameLogsink.java | 4 +- ...SyncCreateSinkOrganizationnameLogsink.java | 4 +- .../SyncCreateSinkProjectnameLogsink.java | 4 +- .../SyncCreateSinkStringLogsink.java | 4 +- .../createview/AsyncCreateView.java | 4 +- .../createview/SyncCreateView.java | 4 +- .../deletebucket/AsyncDeleteBucket.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- .../deleteexclusion/AsyncDeleteExclusion.java | 4 +- .../deleteexclusion/SyncDeleteExclusion.java | 4 +- .../SyncDeleteExclusionLogexclusionname.java | 4 +- .../SyncDeleteExclusionString.java | 4 +- .../deletesink/AsyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSinkLogsinkname.java | 4 +- .../deletesink/SyncDeleteSinkString.java | 4 +- .../deleteview/AsyncDeleteView.java | 4 +- .../deleteview/SyncDeleteView.java | 4 +- .../getbucket/AsyncGetBucket.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../getcmeksettings/AsyncGetCmekSettings.java | 4 +- .../getcmeksettings/SyncGetCmekSettings.java | 4 +- .../getexclusion/AsyncGetExclusion.java | 4 +- .../getexclusion/SyncGetExclusion.java | 4 +- .../SyncGetExclusionLogexclusionname.java | 4 +- .../getexclusion/SyncGetExclusionString.java | 4 +- .../getsink/AsyncGetSink.java | 4 +- .../getsink/SyncGetSink.java | 4 +- .../getsink/SyncGetSinkLogsinkname.java | 4 +- .../getsink/SyncGetSinkString.java | 4 +- .../getview/AsyncGetView.java | 4 +- .../getview/SyncGetView.java | 4 +- .../listbuckets/AsyncListBuckets.java | 4 +- .../listbuckets/AsyncListBucketsPaged.java | 4 +- .../listbuckets/SyncListBuckets.java | 4 +- ...ListBucketsBillingaccountlocationname.java | 4 +- .../SyncListBucketsFolderlocationname.java | 4 +- .../SyncListBucketsLocationname.java | 4 +- ...ncListBucketsOrganizationlocationname.java | 4 +- .../listbuckets/SyncListBucketsString.java | 4 +- .../listexclusions/AsyncListExclusions.java | 4 +- .../AsyncListExclusionsPaged.java | 4 +- .../listexclusions/SyncListExclusions.java | 4 +- .../SyncListExclusionsBillingaccountname.java | 4 +- .../SyncListExclusionsFoldername.java | 4 +- .../SyncListExclusionsOrganizationname.java | 4 +- .../SyncListExclusionsProjectname.java | 4 +- .../SyncListExclusionsString.java | 4 +- .../listsinks/AsyncListSinks.java | 4 +- .../listsinks/AsyncListSinksPaged.java | 4 +- .../listsinks/SyncListSinks.java | 4 +- .../SyncListSinksBillingaccountname.java | 4 +- .../listsinks/SyncListSinksFoldername.java | 4 +- .../SyncListSinksOrganizationname.java | 4 +- .../listsinks/SyncListSinksProjectname.java | 4 +- .../listsinks/SyncListSinksString.java | 4 +- .../listviews/AsyncListViews.java | 4 +- .../listviews/AsyncListViewsPaged.java | 4 +- .../listviews/SyncListViews.java | 4 +- .../listviews/SyncListViewsString.java | 4 +- .../undeletebucket/AsyncUndeleteBucket.java | 4 +- .../undeletebucket/SyncUndeleteBucket.java | 4 +- .../updatebucket/AsyncUpdateBucket.java | 4 +- .../updatebucket/SyncUpdateBucket.java | 4 +- .../AsyncUpdateCmekSettings.java | 4 +- .../SyncUpdateCmekSettings.java | 4 +- .../updateexclusion/AsyncUpdateExclusion.java | 4 +- .../updateexclusion/SyncUpdateExclusion.java | 4 +- ...LogexclusionnameLogexclusionFieldmask.java | 4 +- ...eExclusionStringLogexclusionFieldmask.java | 4 +- .../updatesink/AsyncUpdateSink.java | 4 +- .../updatesink/SyncUpdateSink.java | 4 +- .../SyncUpdateSinkLogsinknameLogsink.java | 4 +- ...UpdateSinkLogsinknameLogsinkFieldmask.java | 4 +- .../SyncUpdateSinkStringLogsink.java | 4 +- .../SyncUpdateSinkStringLogsinkFieldmask.java | 4 +- .../updateview/AsyncUpdateView.java | 4 +- .../updateview/SyncUpdateView.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../deletelog/AsyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLogLogname.java | 4 +- .../deletelog/SyncDeleteLogString.java | 4 +- .../listlogentries/AsyncListLogEntries.java | 4 +- .../AsyncListLogEntriesPaged.java | 4 +- .../listlogentries/SyncListLogEntries.java | 4 +- ...cListLogEntriesListstringStringString.java | 4 +- .../listlogs/AsyncListLogs.java | 4 +- .../listlogs/AsyncListLogsPaged.java | 4 +- .../listlogs/SyncListLogs.java | 4 +- .../SyncListLogsBillingaccountname.java | 4 +- .../listlogs/SyncListLogsFoldername.java | 4 +- .../SyncListLogsOrganizationname.java | 4 +- .../listlogs/SyncListLogsProjectname.java | 4 +- .../listlogs/SyncListLogsString.java | 4 +- ...AsyncListMonitoredResourceDescriptors.java | 4 +- ...ListMonitoredResourceDescriptorsPaged.java | 4 +- .../SyncListMonitoredResourceDescriptors.java | 4 +- .../taillogentries/AsyncTailLogEntries.java | 4 +- .../writelogentries/AsyncWriteLogEntries.java | 4 +- .../writelogentries/SyncWriteLogEntries.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- .../deletelog/SyncDeleteLog.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createlogmetric/AsyncCreateLogMetric.java | 4 +- .../createlogmetric/SyncCreateLogMetric.java | 4 +- ...ncCreateLogMetricProjectnameLogmetric.java | 4 +- .../SyncCreateLogMetricStringLogmetric.java | 4 +- .../deletelogmetric/AsyncDeleteLogMetric.java | 4 +- .../deletelogmetric/SyncDeleteLogMetric.java | 4 +- .../SyncDeleteLogMetricLogmetricname.java | 4 +- .../SyncDeleteLogMetricString.java | 4 +- .../getlogmetric/AsyncGetLogMetric.java | 4 +- .../getlogmetric/SyncGetLogMetric.java | 4 +- .../SyncGetLogMetricLogmetricname.java | 4 +- .../getlogmetric/SyncGetLogMetricString.java | 4 +- .../listlogmetrics/AsyncListLogMetrics.java | 4 +- .../AsyncListLogMetricsPaged.java | 4 +- .../listlogmetrics/SyncListLogMetrics.java | 4 +- .../SyncListLogMetricsProjectname.java | 4 +- .../SyncListLogMetricsString.java | 4 +- .../updatelogmetric/AsyncUpdateLogMetric.java | 4 +- .../updatelogmetric/SyncUpdateLogMetric.java | 4 +- ...UpdateLogMetricLogmetricnameLogmetric.java | 4 +- .../SyncUpdateLogMetricStringLogmetric.java | 4 +- .../getlogmetric/SyncGetLogMetric.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../deletelog/SyncDeleteLog.java | 4 +- .../getlogmetric/SyncGetLogMetric.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createschema/AsyncCreateSchema.java | 4 +- .../createschema/SyncCreateSchema.java | 4 +- ...ncCreateSchemaProjectnameSchemaString.java | 4 +- .../SyncCreateSchemaStringSchemaString.java | 4 +- .../deleteschema/AsyncDeleteSchema.java | 4 +- .../deleteschema/SyncDeleteSchema.java | 4 +- .../SyncDeleteSchemaSchemaname.java | 4 +- .../deleteschema/SyncDeleteSchemaString.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getschema/AsyncGetSchema.java | 4 +- .../getschema/SyncGetSchema.java | 4 +- .../getschema/SyncGetSchemaSchemaname.java | 4 +- .../getschema/SyncGetSchemaString.java | 4 +- .../listschemas/AsyncListSchemas.java | 4 +- .../listschemas/AsyncListSchemasPaged.java | 4 +- .../listschemas/SyncListSchemas.java | 4 +- .../SyncListSchemasProjectname.java | 4 +- .../listschemas/SyncListSchemasString.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../validatemessage/AsyncValidateMessage.java | 4 +- .../validatemessage/SyncValidateMessage.java | 4 +- .../validateschema/AsyncValidateSchema.java | 4 +- .../validateschema/SyncValidateSchema.java | 4 +- .../SyncValidateSchemaProjectnameSchema.java | 4 +- .../SyncValidateSchemaStringSchema.java | 4 +- .../createschema/SyncCreateSchema.java | 4 +- .../createtopic/SyncCreateTopic.java | 4 +- .../createschema/SyncCreateSchema.java | 4 +- .../SyncCreateSubscription.java | 4 +- .../acknowledge/AsyncAcknowledge.java | 4 +- .../acknowledge/SyncAcknowledge.java | 4 +- .../SyncAcknowledgeStringListstring.java | 4 +- ...AcknowledgeSubscriptionnameListstring.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createsnapshot/AsyncCreateSnapshot.java | 4 +- .../createsnapshot/SyncCreateSnapshot.java | 4 +- .../SyncCreateSnapshotSnapshotnameString.java | 4 +- ...eSnapshotSnapshotnameSubscriptionname.java | 4 +- .../SyncCreateSnapshotStringString.java | 4 +- ...cCreateSnapshotStringSubscriptionname.java | 4 +- .../AsyncCreateSubscription.java | 4 +- .../SyncCreateSubscription.java | 4 +- ...SubscriptionStringStringPushconfigInt.java | 4 +- ...scriptionStringTopicnamePushconfigInt.java | 4 +- ...onSubscriptionnameStringPushconfigInt.java | 4 +- ...ubscriptionnameTopicnamePushconfigInt.java | 4 +- .../deletesnapshot/AsyncDeleteSnapshot.java | 4 +- .../deletesnapshot/SyncDeleteSnapshot.java | 4 +- .../SyncDeleteSnapshotSnapshotname.java | 4 +- .../SyncDeleteSnapshotString.java | 4 +- .../AsyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscriptionString.java | 4 +- ...yncDeleteSubscriptionSubscriptionname.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getsnapshot/AsyncGetSnapshot.java | 4 +- .../getsnapshot/SyncGetSnapshot.java | 4 +- .../SyncGetSnapshotSnapshotname.java | 4 +- .../getsnapshot/SyncGetSnapshotString.java | 4 +- .../getsubscription/AsyncGetSubscription.java | 4 +- .../getsubscription/SyncGetSubscription.java | 4 +- .../SyncGetSubscriptionString.java | 4 +- .../SyncGetSubscriptionSubscriptionname.java | 4 +- .../listsnapshots/AsyncListSnapshots.java | 4 +- .../AsyncListSnapshotsPaged.java | 4 +- .../listsnapshots/SyncListSnapshots.java | 4 +- .../SyncListSnapshotsProjectname.java | 4 +- .../SyncListSnapshotsString.java | 4 +- .../AsyncListSubscriptions.java | 4 +- .../AsyncListSubscriptionsPaged.java | 4 +- .../SyncListSubscriptions.java | 4 +- .../SyncListSubscriptionsProjectname.java | 4 +- .../SyncListSubscriptionsString.java | 4 +- .../AsyncModifyAckDeadline.java | 4 +- .../SyncModifyAckDeadline.java | 4 +- ...cModifyAckDeadlineStringListstringInt.java | 4 +- ...DeadlineSubscriptionnameListstringInt.java | 4 +- .../AsyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfigStringPushconfig.java | 4 +- ...yPushConfigSubscriptionnamePushconfig.java | 4 +- .../pull/AsyncPull.java | 4 +- .../pull/SyncPull.java | 4 +- .../pull/SyncPullStringBooleanInt.java | 4 +- .../pull/SyncPullStringInt.java | 4 +- .../SyncPullSubscriptionnameBooleanInt.java | 4 +- .../pull/SyncPullSubscriptionnameInt.java | 4 +- .../seek/AsyncSeek.java | 4 +- .../seek/SyncSeek.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../streamingpull/AsyncStreamingPull.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatesnapshot/AsyncUpdateSnapshot.java | 4 +- .../updatesnapshot/SyncUpdateSnapshot.java | 4 +- .../AsyncUpdateSubscription.java | 4 +- .../SyncUpdateSubscription.java | 4 +- .../SyncCreateSubscription.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createtopic/AsyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopicString.java | 4 +- .../createtopic/SyncCreateTopicTopicname.java | 4 +- .../deletetopic/AsyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopicString.java | 4 +- .../deletetopic/SyncDeleteTopicTopicname.java | 4 +- .../AsyncDetachSubscription.java | 4 +- .../SyncDetachSubscription.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../gettopic/AsyncGetTopic.java | 4 +- .../gettopic/SyncGetTopic.java | 4 +- .../gettopic/SyncGetTopicString.java | 4 +- .../gettopic/SyncGetTopicTopicname.java | 4 +- .../listtopics/AsyncListTopics.java | 4 +- .../listtopics/AsyncListTopicsPaged.java | 4 +- .../listtopics/SyncListTopics.java | 4 +- .../listtopics/SyncListTopicsProjectname.java | 4 +- .../listtopics/SyncListTopicsString.java | 4 +- .../AsyncListTopicSnapshots.java | 4 +- .../AsyncListTopicSnapshotsPaged.java | 4 +- .../SyncListTopicSnapshots.java | 4 +- .../SyncListTopicSnapshotsString.java | 4 +- .../SyncListTopicSnapshotsTopicname.java | 4 +- .../AsyncListTopicSubscriptions.java | 4 +- .../AsyncListTopicSubscriptionsPaged.java | 4 +- .../SyncListTopicSubscriptions.java | 4 +- .../SyncListTopicSubscriptionsString.java | 4 +- .../SyncListTopicSubscriptionsTopicname.java | 4 +- .../publish/AsyncPublish.java | 4 +- .../publish/SyncPublish.java | 4 +- .../SyncPublishStringListpubsubmessage.java | 4 +- ...SyncPublishTopicnameListpubsubmessage.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatetopic/AsyncUpdateTopic.java | 4 +- .../updatetopic/SyncUpdateTopic.java | 4 +- .../createtopic/SyncCreateTopic.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createinstance/AsyncCreateInstance.java | 4 +- .../AsyncCreateInstanceLRO.java | 4 +- .../createinstance/SyncCreateInstance.java | 4 +- ...ateInstanceLocationnameStringInstance.java | 4 +- ...yncCreateInstanceStringStringInstance.java | 4 +- .../deleteinstance/AsyncDeleteInstance.java | 4 +- .../AsyncDeleteInstanceLRO.java | 4 +- .../deleteinstance/SyncDeleteInstance.java | 4 +- .../SyncDeleteInstanceInstancename.java | 4 +- .../SyncDeleteInstanceString.java | 4 +- .../exportinstance/AsyncExportInstance.java | 4 +- .../AsyncExportInstanceLRO.java | 4 +- .../exportinstance/SyncExportInstance.java | 4 +- .../SyncExportInstanceStringOutputconfig.java | 4 +- .../AsyncFailoverInstance.java | 4 +- .../AsyncFailoverInstanceLRO.java | 4 +- .../SyncFailoverInstance.java | 4 +- ...overinstancerequestdataprotectionmode.java | 4 +- ...overinstancerequestdataprotectionmode.java | 4 +- .../getinstance/AsyncGetInstance.java | 4 +- .../getinstance/SyncGetInstance.java | 4 +- .../SyncGetInstanceInstancename.java | 4 +- .../getinstance/SyncGetInstanceString.java | 4 +- .../AsyncGetInstanceAuthString.java | 4 +- .../SyncGetInstanceAuthString.java | 4 +- ...SyncGetInstanceAuthStringInstancename.java | 4 +- .../SyncGetInstanceAuthStringString.java | 4 +- .../importinstance/AsyncImportInstance.java | 4 +- .../AsyncImportInstanceLRO.java | 4 +- .../importinstance/SyncImportInstance.java | 4 +- .../SyncImportInstanceStringInputconfig.java | 4 +- .../listinstances/AsyncListInstances.java | 4 +- .../AsyncListInstancesPaged.java | 4 +- .../listinstances/SyncListInstances.java | 4 +- .../SyncListInstancesLocationname.java | 4 +- .../SyncListInstancesString.java | 4 +- .../AsyncRescheduleMaintenance.java | 4 +- .../AsyncRescheduleMaintenanceLRO.java | 4 +- .../SyncRescheduleMaintenance.java | 4 +- ...tenancerequestrescheduletypeTimestamp.java | 4 +- ...tenancerequestrescheduletypeTimestamp.java | 4 +- .../updateinstance/AsyncUpdateInstance.java | 4 +- .../AsyncUpdateInstanceLRO.java | 4 +- .../updateinstance/SyncUpdateInstance.java | 4 +- .../SyncUpdateInstanceFieldmaskInstance.java | 4 +- .../upgradeinstance/AsyncUpgradeInstance.java | 4 +- .../AsyncUpgradeInstanceLRO.java | 4 +- .../upgradeinstance/SyncUpgradeInstance.java | 4 +- ...SyncUpgradeInstanceInstancenameString.java | 4 +- .../SyncUpgradeInstanceStringString.java | 4 +- .../getinstance/SyncGetInstance.java | 4 +- .../getinstance/SyncGetInstance.java | 4 +- .../composeobject/AsyncComposeObject.java | 4 +- .../composeobject/SyncComposeObject.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbucket/AsyncCreateBucket.java | 4 +- .../createbucket/SyncCreateBucket.java | 4 +- ...ncCreateBucketProjectnameBucketString.java | 4 +- .../SyncCreateBucketStringBucketString.java | 4 +- .../createhmackey/AsyncCreateHmacKey.java | 4 +- .../createhmackey/SyncCreateHmacKey.java | 4 +- .../SyncCreateHmacKeyProjectnameString.java | 4 +- .../SyncCreateHmacKeyStringString.java | 4 +- .../AsyncCreateNotification.java | 4 +- .../SyncCreateNotification.java | 4 +- ...teNotificationProjectnameNotification.java | 4 +- ...cCreateNotificationStringNotification.java | 4 +- .../deletebucket/AsyncDeleteBucket.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- .../SyncDeleteBucketBucketname.java | 4 +- .../deletebucket/SyncDeleteBucketString.java | 4 +- .../deletehmackey/AsyncDeleteHmacKey.java | 4 +- .../deletehmackey/SyncDeleteHmacKey.java | 4 +- .../SyncDeleteHmacKeyStringProjectname.java | 4 +- .../SyncDeleteHmacKeyStringString.java | 4 +- .../AsyncDeleteNotification.java | 4 +- .../SyncDeleteNotification.java | 4 +- ...yncDeleteNotificationNotificationname.java | 4 +- .../SyncDeleteNotificationString.java | 4 +- .../deleteobject/AsyncDeleteObject.java | 4 +- .../deleteobject/SyncDeleteObject.java | 4 +- .../SyncDeleteObjectStringString.java | 4 +- .../SyncDeleteObjectStringStringLong.java | 4 +- .../getbucket/AsyncGetBucket.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../getbucket/SyncGetBucketBucketname.java | 4 +- .../getbucket/SyncGetBucketString.java | 4 +- .../gethmackey/AsyncGetHmacKey.java | 4 +- .../gethmackey/SyncGetHmacKey.java | 4 +- .../SyncGetHmacKeyStringProjectname.java | 4 +- .../SyncGetHmacKeyStringString.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../SyncGetIamPolicyResourcename.java | 4 +- .../getiampolicy/SyncGetIamPolicyString.java | 4 +- .../getnotification/AsyncGetNotification.java | 4 +- .../getnotification/SyncGetNotification.java | 4 +- .../SyncGetNotificationBucketname.java | 4 +- .../SyncGetNotificationString.java | 4 +- .../getobject/AsyncGetObject.java | 4 +- .../getobject/SyncGetObject.java | 4 +- .../getobject/SyncGetObjectStringString.java | 4 +- .../SyncGetObjectStringStringLong.java | 4 +- .../AsyncGetServiceAccount.java | 4 +- .../SyncGetServiceAccount.java | 4 +- .../SyncGetServiceAccountProjectname.java | 4 +- .../SyncGetServiceAccountString.java | 4 +- .../listbuckets/AsyncListBuckets.java | 4 +- .../listbuckets/AsyncListBucketsPaged.java | 4 +- .../listbuckets/SyncListBuckets.java | 4 +- .../SyncListBucketsProjectname.java | 4 +- .../listbuckets/SyncListBucketsString.java | 4 +- .../listhmackeys/AsyncListHmacKeys.java | 4 +- .../listhmackeys/AsyncListHmacKeysPaged.java | 4 +- .../listhmackeys/SyncListHmacKeys.java | 4 +- .../SyncListHmacKeysProjectname.java | 4 +- .../listhmackeys/SyncListHmacKeysString.java | 4 +- .../AsyncListNotifications.java | 4 +- .../AsyncListNotificationsPaged.java | 4 +- .../SyncListNotifications.java | 4 +- .../SyncListNotificationsProjectname.java | 4 +- .../SyncListNotificationsString.java | 4 +- .../listobjects/AsyncListObjects.java | 4 +- .../listobjects/AsyncListObjectsPaged.java | 4 +- .../listobjects/SyncListObjects.java | 4 +- .../SyncListObjectsProjectname.java | 4 +- .../listobjects/SyncListObjectsString.java | 4 +- .../AsyncLockBucketRetentionPolicy.java | 4 +- .../SyncLockBucketRetentionPolicy.java | 4 +- ...ncLockBucketRetentionPolicyBucketname.java | 4 +- .../SyncLockBucketRetentionPolicyString.java | 4 +- .../AsyncQueryWriteStatus.java | 4 +- .../SyncQueryWriteStatus.java | 4 +- .../SyncQueryWriteStatusString.java | 4 +- .../readobject/AsyncReadObject.java | 4 +- .../rewriteobject/AsyncRewriteObject.java | 4 +- .../rewriteobject/SyncRewriteObject.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../SyncSetIamPolicyResourcenamePolicy.java | 4 +- .../SyncSetIamPolicyStringPolicy.java | 4 +- .../AsyncStartResumableWrite.java | 4 +- .../SyncStartResumableWrite.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- ...tIamPermissionsResourcenameListstring.java | 4 +- ...yncTestIamPermissionsStringListstring.java | 4 +- .../updatebucket/AsyncUpdateBucket.java | 4 +- .../updatebucket/SyncUpdateBucket.java | 4 +- .../SyncUpdateBucketBucketFieldmask.java | 4 +- .../updatehmackey/AsyncUpdateHmacKey.java | 4 +- .../updatehmackey/SyncUpdateHmacKey.java | 4 +- ...UpdateHmacKeyHmackeymetadataFieldmask.java | 4 +- .../updateobject/AsyncUpdateObject.java | 4 +- .../updateobject/SyncUpdateObject.java | 4 +- .../SyncUpdateObjectObjectFieldmask.java | 4 +- .../writeobject/AsyncWriteObject.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- version.txt | 2 +- 915 files changed, 1981 insertions(+), 3372 deletions(-) delete mode 100644 src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java delete mode 100644 src/test/java/com/google/api/generator/gapic/model/ServiceTest.java delete mode 100644 src/test/proto/http_rule_parser_testing.proto rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzeiampolicy/AsyncAnalyzeIamPolicy.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzeiampolicy/SyncAnalyzeIamPolicy.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzemove/AsyncAnalyzeMove.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/analyzemove/SyncAnalyzeMove.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/batchgetassetshistory/AsyncBatchGetAssetsHistory.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/batchgetassetshistory/SyncBatchGetAssetsHistory.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/createfeed/AsyncCreateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/createfeed/SyncCreateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/createfeed/SyncCreateFeedString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/deletefeed/AsyncDeleteFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/deletefeed/SyncDeleteFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/deletefeed/SyncDeleteFeedFeedname.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/deletefeed/SyncDeleteFeedString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/exportassets/AsyncExportAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/exportassets/AsyncExportAssetsLRO.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/exportassets/SyncExportAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/getfeed/AsyncGetFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/getfeed/SyncGetFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/getfeed/SyncGetFeedFeedname.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/getfeed/SyncGetFeedString.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listassets/AsyncListAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listassets/AsyncListAssetsPaged.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listassets/SyncListAssets.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listassets/SyncListAssetsResourcename.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listassets/SyncListAssetsString.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listfeeds/AsyncListFeeds.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listfeeds/SyncListFeeds.java (92%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/listfeeds/SyncListFeedsString.java (91%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchalliampolicies/AsyncSearchAllIamPolicies.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchalliampolicies/SyncSearchAllIamPolicies.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java (90%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchallresources/AsyncSearchAllResources.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchallresources/AsyncSearchAllResourcesPaged.java (94%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchallresources/SyncSearchAllResources.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/searchallresources/SyncSearchAllResourcesStringStringListstring.java (90%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/updatefeed/AsyncUpdateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/updatefeed/SyncUpdateFeed.java (93%) rename test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/{assetservice => assetserviceclient}/updatefeed/SyncUpdateFeedFeed.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/AsyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/SyncCheckAndMutateRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/AsyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/SyncMutateRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/SyncMutateRowStringBytestringListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/SyncMutateRowStringBytestringListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/SyncMutateRowTablenameBytestringListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/mutaterows/AsyncMutateRows.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/AsyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/SyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/readrows/AsyncReadRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{bigtable => basebigtabledataclient}/samplerowkeys/AsyncSampleRowKeys.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/aggregatedlist/AsyncAggregatedList.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/aggregatedlist/AsyncAggregatedListPaged.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/aggregatedlist/SyncAggregatedList.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/aggregatedlist/SyncAggregatedListString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/delete/AsyncDelete.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/delete/AsyncDeleteLRO.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/delete/SyncDelete.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/delete/SyncDeleteStringStringString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/insert/AsyncInsert.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/insert/AsyncInsertLRO.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/insert/SyncInsert.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/insert/SyncInsertStringStringAddress.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/list/AsyncList.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/list/AsyncListPaged.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/list/SyncList.java (94%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{addresses => addressesclient}/list/SyncListStringStringString.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/create/SyncCreateSetCredentialsProvider.java (90%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/get/AsyncGet.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/get/SyncGet.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/get/SyncGetStringStringString.java (90%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/wait/AsyncWait.java (93%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/wait/SyncWait.java (92%) rename test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/{regionoperations => regionoperationsclient}/wait/SyncWaitStringStringString.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateaccesstoken/AsyncGenerateAccessToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateaccesstoken/SyncGenerateAccessToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateidtoken/AsyncGenerateIdToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateidtoken/SyncGenerateIdToken.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java (89%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signblob/AsyncSignBlob.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signblob/SyncSignBlob.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signblob/SyncSignBlobStringListstringBytestring.java (91%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signjwt/AsyncSignJwt.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signjwt/SyncSignJwt.java (93%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signjwt/SyncSignJwtServiceaccountnameListstringString.java (90%) rename test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/{iamcredentials => iamcredentialsclient}/signjwt/SyncSignJwtStringListstringString.java (91%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/{iampolicy => iampolicyclient}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricdecrypt/AsyncAsymmetricDecrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricdecrypt/SyncAsymmetricDecrypt.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricsign/AsyncAsymmetricSign.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricsign/SyncAsymmetricSign.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/asymmetricsign/SyncAsymmetricSignStringDigest.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokey/AsyncCreateCryptoKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokey/SyncCreateCryptoKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokeyversion/SyncCreateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createimportjob/AsyncCreateImportJob.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createimportjob/SyncCreateImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createimportjob/SyncCreateImportJobStringStringImportjob.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createkeyring/AsyncCreateKeyRing.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createkeyring/SyncCreateKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/createkeyring/SyncCreateKeyRingStringStringKeyring.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/decrypt/AsyncDecrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/decrypt/SyncDecrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/decrypt/SyncDecryptCryptokeynameBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/decrypt/SyncDecryptStringBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/encrypt/AsyncEncrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/encrypt/SyncEncrypt.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/encrypt/SyncEncryptResourcenameBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/encrypt/SyncEncryptStringBytestring.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokey/AsyncGetCryptoKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokey/SyncGetCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokey/SyncGetCryptoKeyCryptokeyname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokey/SyncGetCryptoKeyString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokeyversion/AsyncGetCryptoKeyVersion.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokeyversion/SyncGetCryptoKeyVersion.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getcryptokeyversion/SyncGetCryptoKeyVersionString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getimportjob/AsyncGetImportJob.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getimportjob/SyncGetImportJob.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getimportjob/SyncGetImportJobImportjobname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getimportjob/SyncGetImportJobString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getkeyring/AsyncGetKeyRing.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getkeyring/SyncGetKeyRing.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getkeyring/SyncGetKeyRingKeyringname.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getkeyring/SyncGetKeyRingString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getlocation/AsyncGetLocation.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getlocation/SyncGetLocation.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getpublickey/AsyncGetPublicKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getpublickey/SyncGetPublicKey.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getpublickey/SyncGetPublicKeyCryptokeyversionname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/getpublickey/SyncGetPublicKeyString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/importcryptokeyversion/AsyncImportCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/importcryptokeyversion/SyncImportCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeys/AsyncListCryptoKeys.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeys/AsyncListCryptoKeysPaged.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeys/SyncListCryptoKeys.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeys/SyncListCryptoKeysKeyringname.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeys/SyncListCryptoKeysString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeyversions/AsyncListCryptoKeyVersions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeyversions/SyncListCryptoKeyVersions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listcryptokeyversions/SyncListCryptoKeyVersionsString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listimportjobs/AsyncListImportJobs.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listimportjobs/AsyncListImportJobsPaged.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listimportjobs/SyncListImportJobs.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listimportjobs/SyncListImportJobsKeyringname.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listimportjobs/SyncListImportJobsString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listkeyrings/AsyncListKeyRings.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listkeyrings/AsyncListKeyRingsPaged.java (94%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listkeyrings/SyncListKeyRings.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listkeyrings/SyncListKeyRingsLocationname.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listkeyrings/SyncListKeyRingsString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listlocations/AsyncListLocations.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listlocations/AsyncListLocationsPaged.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/listlocations/SyncListLocations.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java (91%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokey/AsyncUpdateCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokey/SyncUpdateCryptoKey.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java (89%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java (90%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java (92%) rename test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/{keymanagementservice => keymanagementserviceclient}/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java (89%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createbook/AsyncCreateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createbook/SyncCreateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createbook/SyncCreateBookShelfnameBook.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createbook/SyncCreateBookStringBook.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createshelf/AsyncCreateShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createshelf/SyncCreateShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/createshelf/SyncCreateShelfShelf.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deletebook/AsyncDeleteBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deletebook/SyncDeleteBook.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deletebook/SyncDeleteBookBookname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deletebook/SyncDeleteBookString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deleteshelf/AsyncDeleteShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deleteshelf/SyncDeleteShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deleteshelf/SyncDeleteShelfShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/deleteshelf/SyncDeleteShelfString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getbook/AsyncGetBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getbook/SyncGetBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getbook/SyncGetBookBookname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getbook/SyncGetBookString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getshelf/AsyncGetShelf.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getshelf/SyncGetShelf.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getshelf/SyncGetShelfShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/getshelf/SyncGetShelfString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listbooks/AsyncListBooks.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listbooks/AsyncListBooksPaged.java (94%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listbooks/SyncListBooks.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listbooks/SyncListBooksShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listbooks/SyncListBooksString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listshelves/AsyncListShelves.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listshelves/AsyncListShelvesPaged.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/listshelves/SyncListShelves.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/AsyncMergeShelves.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/SyncMergeShelves.java (92%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/SyncMergeShelvesShelfnameShelfname.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/SyncMergeShelvesShelfnameString.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/SyncMergeShelvesStringShelfname.java (90%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/mergeshelves/SyncMergeShelvesStringString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/AsyncMoveBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/SyncMoveBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/SyncMoveBookBooknameShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/SyncMoveBookBooknameString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/SyncMoveBookStringShelfname.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/movebook/SyncMoveBookStringString.java (91%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/updatebook/AsyncUpdateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/updatebook/SyncUpdateBook.java (93%) rename test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/{libraryservice => libraryserviceclient}/updatebook/SyncUpdateBookBookFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createbucket/AsyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createbucket/SyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/AsyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createexclusion/SyncCreateExclusionStringLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/AsyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSinkBillingaccountnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSinkFoldernameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSinkOrganizationnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSinkProjectnameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createsink/SyncCreateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createview/AsyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/createview/SyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletebucket/AsyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteexclusion/AsyncDeleteExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteexclusion/SyncDeleteExclusion.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteexclusion/SyncDeleteExclusionLogexclusionname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteexclusion/SyncDeleteExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletesink/AsyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletesink/SyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletesink/SyncDeleteSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deletesink/SyncDeleteSinkString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteview/AsyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/deleteview/SyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getbucket/AsyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getbucket/SyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getcmeksettings/AsyncGetCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getcmeksettings/SyncGetCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getexclusion/AsyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getexclusion/SyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getexclusion/SyncGetExclusionLogexclusionname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getexclusion/SyncGetExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getsink/AsyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getsink/SyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getsink/SyncGetSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getsink/SyncGetSinkString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getview/AsyncGetView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/getview/SyncGetView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/AsyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBucketsBillingaccountlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBucketsFolderlocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBucketsLocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBucketsOrganizationlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/AsyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/AsyncListExclusionsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusionsBillingaccountname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusionsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusionsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusionsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listexclusions/SyncListExclusionsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/AsyncListSinks.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/AsyncListSinksPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinks.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinksBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinksFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinksOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinksProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listsinks/SyncListSinksString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listviews/AsyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listviews/AsyncListViewsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listviews/SyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/listviews/SyncListViewsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/undeletebucket/AsyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/undeletebucket/SyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatebucket/SyncUpdateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatecmeksettings/AsyncUpdateCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatecmeksettings/SyncUpdateCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateexclusion/AsyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateexclusion/SyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/AsyncUpdateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/SyncUpdateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/SyncUpdateSinkLogsinknameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/SyncUpdateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateview/AsyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{configservicev2 => configclient}/updateview/SyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/deletelog/AsyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/deletelog/SyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/deletelog/SyncDeleteLogLogname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/deletelog/SyncDeleteLogString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogentries/AsyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogentries/AsyncListLogEntriesPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogentries/SyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogentries/SyncListLogEntriesListstringStringString.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/AsyncListLogs.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/AsyncListLogsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogs.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogsBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listlogs/SyncListLogsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/taillogentries/AsyncTailLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/writelogentries/AsyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/writelogentries/SyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{loggingservicev2 => loggingclient}/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/createlogmetric/AsyncCreateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/createlogmetric/SyncCreateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/createlogmetric/SyncCreateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/deletelogmetric/AsyncDeleteLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/deletelogmetric/SyncDeleteLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/deletelogmetric/SyncDeleteLogMetricLogmetricname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/deletelogmetric/SyncDeleteLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/getlogmetric/AsyncGetLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/getlogmetric/SyncGetLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/getlogmetric/SyncGetLogMetricLogmetricname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/getlogmetric/SyncGetLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/listlogmetrics/AsyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/listlogmetrics/AsyncListLogMetricsPaged.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/listlogmetrics/SyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/listlogmetrics/SyncListLogMetricsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/listlogmetrics/SyncListLogMetricsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/updatelogmetric/AsyncUpdateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/updatelogmetric/SyncUpdateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metricsservicev2 => metricsclient}/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/createschema/AsyncCreateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/createschema/SyncCreateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/createschema/SyncCreateSchemaProjectnameSchemaString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/createschema/SyncCreateSchemaStringSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/deleteschema/AsyncDeleteSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/deleteschema/SyncDeleteSchema.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/deleteschema/SyncDeleteSchemaSchemaname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/deleteschema/SyncDeleteSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getschema/AsyncGetSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getschema/SyncGetSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getschema/SyncGetSchemaSchemaname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/getschema/SyncGetSchemaString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/listschemas/AsyncListSchemas.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/listschemas/AsyncListSchemasPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/listschemas/SyncListSchemas.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/listschemas/SyncListSchemasProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/listschemas/SyncListSchemasString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validatemessage/AsyncValidateMessage.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validatemessage/SyncValidateMessage.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validateschema/AsyncValidateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validateschema/SyncValidateSchema.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validateschema/SyncValidateSchemaProjectnameSchema.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{schemaservice => schemaserviceclient}/validateschema/SyncValidateSchemaStringSchema.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/acknowledge/AsyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/acknowledge/SyncAcknowledge.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/acknowledge/SyncAcknowledgeStringListstring.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/AsyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/SyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/SyncCreateSnapshotSnapshotnameString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/SyncCreateSnapshotStringString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/AsyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/SyncCreateSubscription.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesnapshot/AsyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesnapshot/SyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesnapshot/SyncDeleteSnapshotSnapshotname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesnapshot/SyncDeleteSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesubscription/AsyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesubscription/SyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesubscription/SyncDeleteSubscriptionString.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getiampolicy/SyncGetIamPolicy.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsnapshot/AsyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsnapshot/SyncGetSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsnapshot/SyncGetSnapshotSnapshotname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsnapshot/SyncGetSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsubscription/AsyncGetSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsubscription/SyncGetSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsubscription/SyncGetSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/getsubscription/SyncGetSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsnapshots/AsyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsnapshots/AsyncListSnapshotsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsnapshots/SyncListSnapshots.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsnapshots/SyncListSnapshotsProjectname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsnapshots/SyncListSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsubscriptions/AsyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsubscriptions/AsyncListSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsubscriptions/SyncListSubscriptions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsubscriptions/SyncListSubscriptionsProjectname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/listsubscriptions/SyncListSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifyackdeadline/AsyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifyackdeadline/SyncModifyAckDeadline.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifypushconfig/AsyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifypushconfig/SyncModifyPushConfig.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifypushconfig/SyncModifyPushConfigStringPushconfig.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java (89%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/AsyncPull.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/SyncPull.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/SyncPullStringBooleanInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/SyncPullStringInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/SyncPullSubscriptionnameBooleanInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/pull/SyncPullSubscriptionnameInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/seek/AsyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/seek/SyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/setiampolicy/SyncSetIamPolicy.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/streamingpull/AsyncStreamingPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/testiampermissions/SyncTestIamPermissions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/updatesnapshot/AsyncUpdateSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/updatesnapshot/SyncUpdateSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/updatesubscription/AsyncUpdateSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriber => subscriptionadminclient}/updatesubscription/SyncUpdateSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/createtopic/AsyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/createtopic/SyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/createtopic/SyncCreateTopicString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/createtopic/SyncCreateTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/deletetopic/AsyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/deletetopic/SyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/deletetopic/SyncDeleteTopicString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/deletetopic/SyncDeleteTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/detachsubscription/AsyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/detachsubscription/SyncDetachSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/gettopic/AsyncGetTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/gettopic/SyncGetTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/gettopic/SyncGetTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/gettopic/SyncGetTopicTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopics/AsyncListTopics.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopics/AsyncListTopicsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopics/SyncListTopics.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopics/SyncListTopicsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopics/SyncListTopicsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsnapshots/AsyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsnapshots/SyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsnapshots/SyncListTopicSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsubscriptions/AsyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsubscriptions/SyncListTopicSubscriptions.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsubscriptions/SyncListTopicSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/publish/AsyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/publish/SyncPublish.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/publish/SyncPublishStringListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/publish/SyncPublishTopicnameListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/updatetopic/AsyncUpdateTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{publisher => topicadminclient}/updatetopic/SyncUpdateTopic.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/createinstance/AsyncCreateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/createinstance/AsyncCreateInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/createinstance/SyncCreateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/createinstance/SyncCreateInstanceLocationnameStringInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/createinstance/SyncCreateInstanceStringStringInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/deleteinstance/AsyncDeleteInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/deleteinstance/AsyncDeleteInstanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/deleteinstance/SyncDeleteInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/deleteinstance/SyncDeleteInstanceInstancename.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/deleteinstance/SyncDeleteInstanceString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/exportinstance/AsyncExportInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/exportinstance/AsyncExportInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/exportinstance/SyncExportInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/exportinstance/SyncExportInstanceStringOutputconfig.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/failoverinstance/AsyncFailoverInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/failoverinstance/AsyncFailoverInstanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/failoverinstance/SyncFailoverInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java (88%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java (89%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstance/AsyncGetInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstance/SyncGetInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstance/SyncGetInstanceInstancename.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstance/SyncGetInstanceString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstanceauthstring/AsyncGetInstanceAuthString.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstanceauthstring/SyncGetInstanceAuthString.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/getinstanceauthstring/SyncGetInstanceAuthStringString.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/importinstance/AsyncImportInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/importinstance/AsyncImportInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/importinstance/SyncImportInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/importinstance/SyncImportInstanceStringInputconfig.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/listinstances/AsyncListInstances.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/listinstances/AsyncListInstancesPaged.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/listinstances/SyncListInstances.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/listinstances/SyncListInstancesLocationname.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/listinstances/SyncListInstancesString.java (91%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/reschedulemaintenance/AsyncRescheduleMaintenance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/reschedulemaintenance/SyncRescheduleMaintenance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java (88%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java (89%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/updateinstance/AsyncUpdateInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/updateinstance/AsyncUpdateInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/updateinstance/SyncUpdateInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/updateinstance/SyncUpdateInstanceFieldmaskInstance.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/upgradeinstance/AsyncUpgradeInstance.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/upgradeinstance/AsyncUpgradeInstanceLRO.java (93%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/upgradeinstance/SyncUpgradeInstance.java (92%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/upgradeinstance/SyncUpgradeInstanceInstancenameString.java (90%) rename test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/{cloudredis => cloudredisclient}/upgradeinstance/SyncUpgradeInstanceStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/composeobject/AsyncComposeObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/composeobject/SyncComposeObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createbucket/AsyncCreateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createbucket/SyncCreateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createbucket/SyncCreateBucketProjectnameBucketString.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createbucket/SyncCreateBucketStringBucketString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createhmackey/AsyncCreateHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createhmackey/SyncCreateHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createhmackey/SyncCreateHmacKeyProjectnameString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createhmackey/SyncCreateHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createnotification/AsyncCreateNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createnotification/SyncCreateNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createnotification/SyncCreateNotificationProjectnameNotification.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/createnotification/SyncCreateNotificationStringNotification.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletebucket/AsyncDeleteBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletebucket/SyncDeleteBucketBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletebucket/SyncDeleteBucketString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletehmackey/AsyncDeleteHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletehmackey/SyncDeleteHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletehmackey/SyncDeleteHmacKeyStringProjectname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletehmackey/SyncDeleteHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletenotification/AsyncDeleteNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletenotification/SyncDeleteNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletenotification/SyncDeleteNotificationNotificationname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deletenotification/SyncDeleteNotificationString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deleteobject/AsyncDeleteObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deleteobject/SyncDeleteObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deleteobject/SyncDeleteObjectStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/deleteobject/SyncDeleteObjectStringStringLong.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getbucket/AsyncGetBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getbucket/SyncGetBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getbucket/SyncGetBucketBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getbucket/SyncGetBucketString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/gethmackey/AsyncGetHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/gethmackey/SyncGetHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/gethmackey/SyncGetHmacKeyStringProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/gethmackey/SyncGetHmacKeyStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getiampolicy/AsyncGetIamPolicy.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getiampolicy/SyncGetIamPolicyResourcename.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getiampolicy/SyncGetIamPolicyString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getnotification/AsyncGetNotification.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getnotification/SyncGetNotification.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getnotification/SyncGetNotificationBucketname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getnotification/SyncGetNotificationString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getobject/AsyncGetObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getobject/SyncGetObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getobject/SyncGetObjectStringString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getobject/SyncGetObjectStringStringLong.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getserviceaccount/AsyncGetServiceAccount.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getserviceaccount/SyncGetServiceAccount.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getserviceaccount/SyncGetServiceAccountProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/getserviceaccount/SyncGetServiceAccountString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listbuckets/AsyncListBuckets.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listbuckets/SyncListBuckets.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listbuckets/SyncListBucketsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listhmackeys/AsyncListHmacKeys.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listhmackeys/AsyncListHmacKeysPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listhmackeys/SyncListHmacKeys.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listhmackeys/SyncListHmacKeysProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listhmackeys/SyncListHmacKeysString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listnotifications/AsyncListNotifications.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listnotifications/AsyncListNotificationsPaged.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listnotifications/SyncListNotifications.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listnotifications/SyncListNotificationsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listnotifications/SyncListNotificationsString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listobjects/AsyncListObjects.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listobjects/AsyncListObjectsPaged.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listobjects/SyncListObjects.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listobjects/SyncListObjectsProjectname.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/listobjects/SyncListObjectsString.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java (92%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/querywritestatus/AsyncQueryWriteStatus.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/querywritestatus/SyncQueryWriteStatus.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/querywritestatus/SyncQueryWriteStatusString.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/readobject/AsyncReadObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/rewriteobject/AsyncRewriteObject.java (96%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/rewriteobject/SyncRewriteObject.java (96%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/setiampolicy/SyncSetIamPolicyStringPolicy.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/startresumablewrite/AsyncStartResumableWrite.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/startresumablewrite/SyncStartResumableWrite.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/testiampermissions/SyncTestIamPermissionsStringListstring.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatebucket/SyncUpdateBucket.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatebucket/SyncUpdateBucketBucketFieldmask.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatehmackey/AsyncUpdateHmacKey.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatehmackey/SyncUpdateHmacKey.java (93%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java (90%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updateobject/AsyncUpdateObject.java (95%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updateobject/SyncUpdateObject.java (94%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/updateobject/SyncUpdateObjectObjectFieldmask.java (91%) rename test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/{storage => storageclient}/writeobject/AsyncWriteObject.java (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c3772c261..cd8f0c42fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,34 +1,5 @@ # Changelog -## [2.10.3](https://github.com/googleapis/gapic-generator-java/compare/v2.10.2...v2.10.3) (2022-11-01) - - -### Bug Fixes - -* Fix REST transport client creation generated javadoc sample ([#1077](https://github.com/googleapis/gapic-generator-java/issues/1077)) ([9ac0ca8](https://github.com/googleapis/gapic-generator-java/commit/9ac0ca80b09077f7880f0029b5d7b090a10a10b8)) -* Fixes regionTag breakage ([#1068](https://github.com/googleapis/gapic-generator-java/issues/1068)) ([bed9f72](https://github.com/googleapis/gapic-generator-java/commit/bed9f721fbafb5f2e974b6f43f8455f2fdb581f7)) - -## [2.10.2](https://github.com/googleapis/gapic-generator-java/compare/v2.10.1...v2.10.2) (2022-10-24) - - -### Bug Fixes - -* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.5 ([#1063](https://github.com/googleapis/gapic-generator-java/issues/1063)) ([80ed62c](https://github.com/googleapis/gapic-generator-java/commit/80ed62cf6aff395d150e394a44fb60da37e9a6ae)) -* Update regionTag to use service name ([#1047](https://github.com/googleapis/gapic-generator-java/issues/1047)) ([68b33c2](https://github.com/googleapis/gapic-generator-java/commit/68b33c23948ffe7a2bf6acd53731d786257f6bd1)) - -## [2.10.1](https://github.com/googleapis/gapic-generator-java/compare/v2.10.0...v2.10.1) (2022-10-20) - - -### Bug Fixes - -* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#1035](https://github.com/googleapis/gapic-generator-java/issues/1035)) ([f76634a](https://github.com/googleapis/gapic-generator-java/commit/f76634af8497ef2977376af570d175eb0fe91e6f)) -* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#1039](https://github.com/googleapis/gapic-generator-java/issues/1039)) ([9d25e47](https://github.com/googleapis/gapic-generator-java/commit/9d25e477126db35efd111a2b8ee76332b549ce91)) -* **deps:** Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#1050](https://github.com/googleapis/gapic-generator-java/issues/1050)) ([3b052e2](https://github.com/googleapis/gapic-generator-java/commit/3b052e27bb704124ae3214dd3e8708f8e32afe6c)) -* **deps:** Update dependency org.yaml:snakeyaml to v1.32 ([#1037](https://github.com/googleapis/gapic-generator-java/issues/1037)) ([b520aa0](https://github.com/googleapis/gapic-generator-java/commit/b520aa0d35407daf96123d63c3112b9f29715115)) -* **deps:** Update dependency org.yaml:snakeyaml to v1.33 ([#1043](https://github.com/googleapis/gapic-generator-java/issues/1043)) ([67a5dc5](https://github.com/googleapis/gapic-generator-java/commit/67a5dc5e4dd3302ececd212dd047f5731c4bf74d)) -* Get numeric value for Enum fields if it is configured as query param or path param ([#1042](https://github.com/googleapis/gapic-generator-java/issues/1042)) ([0fdfa67](https://github.com/googleapis/gapic-generator-java/commit/0fdfa67fec84e1983c12b10c7b7ae7a0efa80f4d)) -* Update sample region tag to parse host instead of proto package ([#1040](https://github.com/googleapis/gapic-generator-java/issues/1040)) ([01c14d4](https://github.com/googleapis/gapic-generator-java/commit/01c14d41d4195963c0ed46f310360f39eec6d420)) - ## [2.10.0](https://github.com/googleapis/gapic-generator-java/compare/v2.9.0...v2.10.0) (2022-09-06) diff --git a/PROPERTIES.bzl b/PROPERTIES.bzl index 4d5e0f286e..78b7d809c0 100644 --- a/PROPERTIES.bzl +++ b/PROPERTIES.bzl @@ -1,5 +1,5 @@ PROPERTIES = { - "version.com_google_protobuf": "3.21.7", + "version.com_google_protobuf": "3.19.1", # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8. "version.google_java_format": "1.7", "version.io_grpc_java": "1.42.1", @@ -10,7 +10,7 @@ PROPERTIES = { "maven.com_google_auto_value_auto_value": "com.google.auto.value:auto-value:1.7.2", "maven.com_google_auto_value_auto_value_annotations": "com.google.auto.value:auto-value-annotations:1.7.2", "maven.com_google_code_gson": "com.google.code.gson:gson:2.8.6", - "maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.21.7", + "maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.19.1", "maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.11", "maven.javax_annotation_javax_annotation_api": "javax.annotation:javax.annotation-api:1.3.2", diff --git a/pom.xml b/pom.xml index 76416d39da..10f973578d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.5 + 3.0.2 pom import @@ -42,7 +42,7 @@ com.google.auto.value auto-value - 1.10 + 1.9 @@ -155,7 +155,7 @@ protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.19.4:exe:${os.detected.classifier} @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.3.0 package @@ -311,7 +311,7 @@ org.yaml snakeyaml - 1.33 + 1.31 com.google.googlejavaformat diff --git a/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java b/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java index b3b2c9d997..0967cea087 100644 --- a/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java +++ b/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java @@ -183,7 +183,6 @@ public void visit(TernaryExpr ternaryExpr) { @Override public void visit(VariableExpr variableExpr) { variableExpr.variable().type().accept(this); - annotations(variableExpr.annotations()); if (variableExpr.exprReferenceExpr() != null) { variableExpr.exprReferenceExpr().accept(this); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index acd914a163..8306930de1 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -15,7 +15,6 @@ package com.google.api.generator.gapic.composer; import com.google.api.generator.engine.ast.ClassDefinition; -import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.gapic.composer.comment.CommentComposer; import com.google.api.generator.gapic.composer.grpc.GrpcServiceCallableFactoryClassComposer; import com.google.api.generator.gapic.composer.grpc.GrpcServiceStubClassComposer; @@ -48,7 +47,8 @@ public static List composeServiceClasses(GapicContext context) { clazzes.addAll(generateServiceClasses(context)); clazzes.addAll(generateMockClasses(context, context.mixinServices())); clazzes.addAll(generateResourceNameHelperClasses(context)); - return addApacheLicense(prepareExecutableSamples(clazzes)); + return addApacheLicense( + prepareExecutableSamples(clazzes, context.gapicMetadata().getProtoPackage())); } public static GapicPackageInfo composePackageInfo(GapicContext context) { @@ -190,30 +190,37 @@ public static List generateTestClasses(GapicContext context) { } @VisibleForTesting - static List prepareExecutableSamples(List clazzes) { - // Include license header, apiShortName, and apiVersion - List clazzesWithSamples = new ArrayList<>(); - clazzes.forEach( - gapicClass -> { - List samples = new ArrayList<>(); - gapicClass - .samples() - .forEach( - sample -> - samples.add( - addRegionTagAndHeaderToSample( - sample, gapicClass.apiShortName(), gapicClass.apiVersion()))); - clazzesWithSamples.add(gapicClass.withSamples(samples)); - }); - return clazzesWithSamples; + static List prepareExecutableSamples(List clazzes, String protoPackage) { + // parse protoPackage for apiVersion and apiShortName + String[] pakkage = protoPackage.split("\\."); + String apiVersion; + String apiShortName; + // e.g. v1, v2, v1beta1 + if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { + apiVersion = pakkage[pakkage.length - 1]; + apiShortName = pakkage[pakkage.length - 2]; + } else { + apiVersion = ""; + apiShortName = pakkage[pakkage.length - 1]; + } + // Include license header, apiShortName, and apiVersion + return clazzes.stream() + .map( + gapicClass -> { + List samples = + gapicClass.samples().stream() + .map( + sample -> addRegionTagAndHeaderToSample(sample, apiShortName, apiVersion)) + .collect(Collectors.toList()); + return gapicClass.withSamples(samples); + }) + .collect(Collectors.toList()); } - @VisibleForTesting - protected static Sample addRegionTagAndHeaderToSample( + private static Sample addRegionTagAndHeaderToSample( Sample sample, String apiShortName, String apiVersion) { - final List header = Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT); return sample - .withHeader(header) + .withHeader(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT)) .withRegionTag( sample.regionTag().withApiVersion(apiVersion).withApiShortName(apiShortName)); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index b6095be08b..cf99df8d15 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -163,9 +163,7 @@ public GapicClass generate(GapicContext context, Service service) { .build(); updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames); - return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withApiShortName(service.apiShortName()) - .withApiVersion(service.apiVersion()); + return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); } private static List createClassAnnotations(Service service, TypeStore typeStore) { @@ -200,11 +198,9 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample( - clientType, settingsType, service); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample( - clientType, settingsType, service); + ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); samples.addAll(Arrays.asList(classMethodSampleCode, credentialsSampleCode, endpointSampleCode)); return ServiceClientCommentComposer.createClassHeaderComments( service, @@ -582,8 +578,7 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples, - service); + samples); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata @@ -601,8 +596,7 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples, - service); + samples); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata.get(method.name()).add(javaMethodNameFn.apply(generatedMethod)); @@ -642,8 +636,7 @@ private static List createMethodVariants( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples, - Service service) { + List samples) { List javaMethods = new ArrayList<>(); String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); @@ -707,12 +700,7 @@ private static List createMethodVariants( Optional methodSample = Optional.of( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, - typeStore.get(clientName), - signature, - resourceNames, - messageTypes, - service)); + method, typeStore.get(clientName), signature, resourceNames, messageTypes)); Optional methodDocSample = Optional.empty(); if (methodSample.isPresent()) { samples.add(methodSample.get()); @@ -756,8 +744,7 @@ private static MethodDefinition createMethodDefaultMethod( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples, - Service service) { + List samples) { String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); TypeNode methodOutputType = @@ -801,7 +788,7 @@ private static MethodDefinition createMethodDefaultMethod( Optional defaultMethodSample = Optional.of( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, typeStore.get(clientName), resourceNames, messageTypes, service)); + method, typeStore.get(clientName), resourceNames, messageTypes)); Optional defaultMethodDocSample = Optional.empty(); if (defaultMethodSample.isPresent()) { samples.add(defaultMethodSample.get()); @@ -943,8 +930,7 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes, - service)); + messageTypes)); } else if (callableMethodKind.equals(CallableMethodKind.PAGED)) { sampleCode = Optional.of( @@ -952,8 +938,7 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes, - service)); + messageTypes)); } else if (callableMethodKind.equals(CallableMethodKind.REGULAR)) { if (method.stream().equals(Stream.NONE)) { sampleCode = @@ -962,8 +947,7 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes, - service)); + messageTypes)); } else { sampleCode = Optional.of( @@ -971,8 +955,7 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes, - service)); + messageTypes)); } } Optional sampleDocCode = Optional.empty(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java index fdfa33f471..68780ed6bc 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java @@ -126,9 +126,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, typeStore)) .setNestedClasses(Arrays.asList(createNestedBuilderClass(service, typeStore))) .build(); - return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withApiShortName(service.apiShortName()) - .withApiVersion(service.apiVersion()); + return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); } private static List createClassHeaderComments( diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index fe66a11e77..1074173850 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -201,9 +201,7 @@ public GapicClass generate(GapicContext context, Service service) { Arrays.asList(createNestedBuilderClass(service, serviceConfig, typeStore))) .build(); return GapicClass.create( - GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withApiShortName(service.apiShortName()) - .withApiVersion(service.apiVersion()); + GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)); } protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index 8933b7b4ed..e600ada5d2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -54,14 +54,12 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample( - clientType, settingsType, service); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample( - clientType, settingsType, service); + ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); Sample transportSampleCode = ServiceClientHeaderSampleComposer.composeTransportSample( - clientType, settingsType, "newHttpJsonBuilder", service); + clientType, settingsType, "defaultHttpJsonTransportProviderBuilder"); samples.addAll( Arrays.asList( classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode)); diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index 67e003f50f..fa4d71498c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -59,7 +59,6 @@ import com.google.api.generator.gapic.model.OperationResponse; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableList; import com.google.protobuf.TypeRegistry; @@ -75,7 +74,6 @@ import java.util.stream.Collectors; public class HttpJsonServiceStubClassComposer extends AbstractTransportServiceStubClassComposer { - private static final HttpJsonServiceStubClassComposer INSTANCE = new HttpJsonServiceStubClassComposer(); @@ -942,11 +940,9 @@ private Expr createFieldsExtractorClassInstance( for (int i = 0; i < descendantFields.length; i++) { String currFieldName = descendantFields[i]; String bindingFieldMethodName = - getBindingFieldMethodName( - httpBindingFieldName, - descendantFields.length, - i, - JavaStyle.toUpperCamelCase(currFieldName)); + (i < descendantFields.length - 1 || !httpBindingFieldName.isRepeated()) + ? String.format("get%s", JavaStyle.toUpperCamelCase(currFieldName)) + : String.format("get%sList", JavaStyle.toUpperCamelCase(currFieldName)); requestFieldGetterExprBuilder = requestFieldGetterExprBuilder.setMethodName(bindingFieldMethodName); @@ -1001,7 +997,6 @@ private Expr createFieldsExtractorClassInstance( } } - // Add a fixed query param for numeric enum, see b/232457244 for details if (restNumericEnumsEnabled && serializerMethodName.equals("putQueryParam")) { ImmutableList.Builder paramsPutArgs = ImmutableList.builder(); @@ -1028,20 +1023,6 @@ private Expr createFieldsExtractorClassInstance( .build(); } - @VisibleForTesting - String getBindingFieldMethodName( - HttpBinding httpBindingField, int descendantFieldsLengths, int index, String currFieldName) { - if (index == descendantFieldsLengths - 1) { - if (httpBindingField.isRepeated()) { - return String.format("get%sList", currFieldName); - } - if (httpBindingField.isEnum()) { - return String.format("get%sValue", currFieldName); - } - } - return String.format("get%s", currFieldName); - } - private List getHttpMethodTypeExpr(Method protoMethod) { return Collections.singletonList( ValueExpr.withValue( diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java index 342fab52ad..ae1ad2bbb7 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java @@ -48,7 +48,6 @@ import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; -import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -61,7 +60,7 @@ public class ServiceClientCallableMethodSampleComposer { private static Sample composeUnaryOrLroCallableSample( - Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, Service service) { + Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr) { List bodyStatements = new ArrayList<>(); // Create api future variable expression, and assign it with a value by invoking callable // method. @@ -125,7 +124,7 @@ private static Sample composeUnaryOrLroCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -140,8 +139,7 @@ private static Sample composePagedCallableSample( Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, - Map messageTypes, - Service service) { + Map messageTypes) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); Field repeatedPagedResultsField = methodOutputMessage.findAndUnwrapPaginatedRepeatedField(); @@ -280,7 +278,7 @@ private static Sample composePagedCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setOverloadDisambiguation("Paged") .setIsAsynchronous(true) @@ -296,8 +294,7 @@ public static Sample composeLroCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -397,7 +394,7 @@ public static Sample composeLroCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientType.reference().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .setOverloadDisambiguation("LRO") @@ -418,8 +415,7 @@ public static Sample composePagedCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -535,7 +531,7 @@ public static Sample composePagedCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientType.reference().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -547,8 +543,7 @@ public static Sample composeRegularCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -580,13 +575,13 @@ public static Sample composeRegularCallableMethod( RegionTag regionTag; if (method.isPaged()) { Sample pagedCallable = - composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes, service); + composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes); bodyStatements.addAll(pagedCallable.body()); regionTag = pagedCallable.regionTag(); } else { // e.g. echoClient.echoCallable().futureCall(request) Sample unaryOrLroCallable = - composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr, service); + composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr); bodyStatements.addAll(unaryOrLroCallable.body()); regionTag = unaryOrLroCallable.regionTag(); } @@ -606,8 +601,7 @@ public static Sample composeStreamCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -636,19 +630,16 @@ public static Sample composeStreamCallableMethod( List bodyStatements = new ArrayList<>(); if (method.stream().equals(Method.Stream.SERVER)) { // e.g. ServerStream stream = echoClient.expandCallable().call(request); - Sample streamServer = - composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr, service); + Sample streamServer = composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr); bodyStatements.addAll(streamServer.body()); regionTag = streamServer.regionTag(); } else if (method.stream().equals(Method.Stream.BIDI)) { // e.g. echoClient.collect().clientStreamingCall(responseObserver); - Sample streamBidi = - composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr, service); + Sample streamBidi = composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr); bodyStatements.addAll(streamBidi.body()); regionTag = streamBidi.regionTag(); } else if (method.stream().equals(Method.Stream.CLIENT)) { - Sample streamClient = - composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr, service); + Sample streamClient = composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr); bodyStatements.addAll(streamClient.body()); regionTag = streamClient.regionTag(); } @@ -665,10 +656,7 @@ public static Sample composeStreamCallableMethod( } private static Sample composeStreamServerSample( - Method method, - VariableExpr clientVarExpr, - AssignmentExpr requestAssignmentExpr, - Service service) { + Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { List bodyExprs = new ArrayList<>(); bodyExprs.add(requestAssignmentExpr); @@ -729,7 +717,7 @@ private static Sample composeStreamServerSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -737,10 +725,7 @@ private static Sample composeStreamServerSample( } private static Sample composeStreamBidiSample( - Method method, - VariableExpr clientVarExpr, - AssignmentExpr requestAssignmentExpr, - Service service) { + Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { List bodyExprs = new ArrayList<>(); // Create bidi stream variable expression and assign it with invoking client's bidi stream @@ -811,7 +796,7 @@ private static Sample composeStreamBidiSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -819,10 +804,7 @@ private static Sample composeStreamBidiSample( } private static Sample composeStreamClientSample( - Method method, - VariableExpr clientVarExpr, - AssignmentExpr requestAssignmentExpr, - Service service) { + Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { List bodyExprs = new ArrayList<>(); // Create responseObserver variable expression. @@ -946,7 +928,7 @@ private static Sample composeStreamClientSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index b979f87744..6c3389b865 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -53,7 +53,7 @@ public static Sample composeClassHeaderSample( Map resourceNames, Map messageTypes) { if (service.methods().isEmpty()) { - return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType, service); + return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType); } // Use the first pure unary RPC method's sample code as showcase, if no such method exists, use @@ -67,18 +67,13 @@ public static Sample composeClassHeaderSample( if (method.stream() == Method.Stream.NONE) { if (method.methodSignatures().isEmpty()) { return ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service); + method, clientType, resourceNames, messageTypes); } return composeShowcaseMethodSample( - method, - clientType, - method.methodSignatures().get(0), - resourceNames, - messageTypes, - service); + method, clientType, method.methodSignatures().get(0), resourceNames, messageTypes); } return ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service); + method, clientType, resourceNames, messageTypes); } public static Sample composeShowcaseMethodSample( @@ -86,8 +81,7 @@ public static Sample composeShowcaseMethodSample( TypeNode clientType, List arguments, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -111,20 +105,20 @@ public static Sample composeShowcaseMethodSample( if (method.isPaged()) { Sample unaryPagedRpc = ServiceClientMethodSampleComposer.composePagedSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { Sample unaryLroRpc = ServiceClientMethodSampleComposer.composeLroSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(), echoClient.echo(...) Sample unaryRpc = ServiceClientMethodSampleComposer.composeSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -140,8 +134,7 @@ public static Sample composeShowcaseMethodSample( return Sample.builder().setBody(body).setRegionTag(regionTag).build(); } - public static Sample composeSetCredentialsSample( - TypeNode clientType, TypeNode settingsType, Service service) { + public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode settingsType) { // Initialize clientSettings with builder() method. // e.g. EchoSettings echoSettings = // EchoSettings.newBuilder().setCredentialsProvider(FixedCredentialsProvider.create("myCredentials")).build(); @@ -213,16 +206,14 @@ public static Sample composeSetCredentialsSample( ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientName) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); - Sample sample = Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); - return sample.withRegionTag(sample.regionTag()); + return Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); } - public static Sample composeSetEndpointSample( - TypeNode clientType, TypeNode settingsType, Service service) { + public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode settingsType) { // Initialize client settings with builder() method. // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build(); String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); @@ -282,7 +273,7 @@ public static Sample composeSetEndpointSample( .build(); RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientName) .setRpcName(rpcName) .setOverloadDisambiguation("setEndpoint") .build(); @@ -293,7 +284,7 @@ public static Sample composeSetEndpointSample( } public static Sample composeTransportSample( - TypeNode clientType, TypeNode settingsType, String transportBuilderMethod, Service service) { + TypeNode clientType, TypeNode settingsType, String transportProviderMethod) { String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = @@ -302,11 +293,26 @@ public static Sample composeTransportSample( MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() .setStaticReferenceType(settingsType) - .setMethodName(transportBuilderMethod) + .setMethodName("newBuilder") .build(); - MethodInvocationExpr buildMethodExpr = + MethodInvocationExpr transportChannelProviderArg = + MethodInvocationExpr.builder() + .setExprReferenceExpr( + MethodInvocationExpr.builder() + .setStaticReferenceType(settingsType) + .setMethodName(transportProviderMethod) + .build()) + .setMethodName("build") + .build(); + MethodInvocationExpr credentialsMethodExpr = MethodInvocationExpr.builder() .setExprReferenceExpr(newBuilderMethodExpr) + .setArguments(transportChannelProviderArg) + .setMethodName("setTransportChannelProvider") + .build(); + MethodInvocationExpr buildMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(credentialsMethodExpr) .setReturnType(settingsType) .setMethodName("build") .build(); @@ -340,7 +346,7 @@ public static Sample composeTransportSample( ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientName) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java index 311ebab5ac..f93383c729 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java @@ -33,7 +33,6 @@ import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; -import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -46,7 +45,7 @@ public class ServiceClientMethodSampleComposer { // Creates an example for an empty service (no API methods), which is a corner case but can // happen. Generated example will only show how to instantiate the client class but will not call // any API methods (because there are no API methods). - public static Sample composeEmptyServiceSample(TypeNode clientType, Service service) { + public static Sample composeEmptyServiceSample(TypeNode clientType) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -57,7 +56,10 @@ public static Sample composeEmptyServiceSample(TypeNode clientType, Service serv List bodyStatements = new ArrayList<>(); RegionTag regionTag = - RegionTag.builder().setServiceName(service.name()).setRpcName("emtpy").build(); + RegionTag.builder() + .setServiceName(clientVarExpr.variable().identifier().name()) + .setRpcName("emtpy") + .build(); List body = Arrays.asList( @@ -74,8 +76,7 @@ public static Sample composeCanonicalSample( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes, - Service service) { + Map messageTypes) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -110,19 +111,16 @@ public static Sample composeCanonicalSample( if (method.isPaged()) { // e.g. echoClient.pagedExpand(request).iterateAll() Sample unaryPagedRpc = - composePagedSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); + composePagedSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { - Sample unaryLroRpc = - composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); + Sample unaryLroRpc = composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(request) - Sample unaryRpc = - composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); + Sample unaryRpc = composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -142,8 +140,7 @@ static Sample composeSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs, - Service service) { + List bodyExprs) { // Invoke current method based on return type. // e.g. if return void, echoClient.echo(..); or, @@ -172,7 +169,7 @@ static Sample composeSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -189,8 +186,7 @@ static Sample composePagedSample( VariableExpr clientVarExpr, List rpcMethodArgVarExprs, List bodyExprs, - Map messageTypes, - Service service) { + Map messageTypes) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); @@ -247,7 +243,7 @@ static Sample composePagedSample( RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -259,8 +255,7 @@ static Sample composeLroSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs, - Service service) { + List bodyExprs) { // Assign response variable with invoking client's LRO method. // e.g. if return void, echoClient.waitAsync(ttl).get(); or, // e.g. if return other type, WaitResponse response = echoClient.waitAsync(ttl).get(); @@ -298,7 +293,7 @@ static Sample composeLroSample( } RegionTag regionTag = RegionTag.builder() - .setServiceName(service.name()) + .setServiceName(clientVarExpr.variable().identifier().name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java index 372399ee56..9027f50000 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java @@ -145,7 +145,6 @@ public static Optional composeSettingsSample( .map(e -> ExprStatement.withExpr(e)) .collect(Collectors.toList()); - // TODO: alicejli edit RegionTag to match other languages RegionTag regionTag = RegionTag.builder() .setServiceName(classType.reference().name()) diff --git a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java index 1228e5d166..c0b717fc0a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java +++ b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java @@ -24,8 +24,7 @@ public class ClassNames { // Using constants since many of these class names are used often. private static final String MOCK_SERVICE_CLASS_NAME_PATTERN = "Mock%s"; private static final String MOCK_SERVICE_IMPL_CLASS_NAME_PATTERN = "Mock%sImpl"; - private static final String CLIENT_SUFFIX = "Client"; - private static final String SERVICE_CLIENT_CLASS_NAME_PATTERN = "%s" + CLIENT_SUFFIX; + private static final String SERVICE_CLIENT_CLASS_NAME_PATTERN = "%sClient"; private static final String SERVICE_CLIENT_TEST_CLASS_NAME_PATTERN = "%sClientTest"; private static final String SERVICE_CLIENT_TRANSPORT_TEST_CLASS_NAME_PATTERN = "%sClient%sTest"; private static final String SERVICE_SETTINGS_CLASS_NAME_PATTERN = "%sSettings"; diff --git a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java index f05e308290..eee6349fa8 100644 --- a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java +++ b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java @@ -35,12 +35,6 @@ public enum Kind { public abstract List samples(); - // Only used for generating the region tag for samples; therefore only used in select Composers. - public abstract String apiShortName(); - - // Only used for generating the region tag for samples; therefore only used in select Composers. - public abstract String apiVersion(); - public static GapicClass create(Kind kind, ClassDefinition classDefinition) { return builder().setKind(kind).setClassDefinition(classDefinition).build(); } @@ -51,10 +45,7 @@ public static GapicClass create( } static Builder builder() { - return new AutoValue_GapicClass.Builder() - .setSamples(Collections.emptyList()) - .setApiShortName("") - .setApiVersion(""); + return new AutoValue_GapicClass.Builder().setSamples(Collections.emptyList()); } abstract Builder toBuilder(); @@ -63,14 +54,6 @@ public final GapicClass withSamples(List samples) { return toBuilder().setSamples(samples).build(); } - public final GapicClass withApiShortName(String apiShortName) { - return toBuilder().setApiShortName(apiShortName).build(); - } - - public final GapicClass withApiVersion(String apiVersion) { - return toBuilder().setApiVersion(apiVersion).build(); - } - @AutoValue.Builder abstract static class Builder { abstract Builder setKind(Kind kind); @@ -79,10 +62,6 @@ abstract static class Builder { abstract Builder setSamples(List samples); - abstract Builder setApiShortName(String apiShortName); - - abstract Builder setApiVersion(String apiVersion); - abstract GapicClass build(); } } diff --git a/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java b/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java index 696683cefe..e6ecea5c94 100644 --- a/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java +++ b/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java @@ -36,54 +36,21 @@ public enum HttpVerb { @AutoValue public abstract static class HttpBinding implements Comparable { - - // The fully qualified name of the field. e.g. request.complex_object.another_object.name public abstract String name(); abstract String lowerCamelName(); - // An object that contains all info of the leaf level field - @Nullable - public abstract Field field(); + public abstract boolean isOptional(); - public boolean isOptional() { - return field() != null && field().isProto3Optional(); - } - - public boolean isRepeated() { - return field() != null && field().isRepeated(); - } - - public boolean isEnum() { - return field() != null && field().isEnum(); - } + public abstract boolean isRepeated(); @Nullable public abstract String valuePattern(); - public static HttpBindings.HttpBinding.Builder builder() { - return new AutoValue_HttpBindings_HttpBinding.Builder(); - } - - @AutoValue.Builder - public abstract static class Builder { - - public abstract HttpBindings.HttpBinding.Builder setName(String name); - - public abstract HttpBindings.HttpBinding.Builder setField(Field field); - - abstract HttpBindings.HttpBinding.Builder setLowerCamelName(String lowerCamelName); - - public abstract HttpBindings.HttpBinding.Builder setValuePattern(String valuePattern); - - abstract String name(); - - abstract HttpBindings.HttpBinding autoBuild(); - - public HttpBindings.HttpBinding build() { - setLowerCamelName(JavaStyle.toLowerCamelCase(name())); - return autoBuild(); - } + public static HttpBinding create( + String name, boolean isOptional, boolean isRepeated, String valuePattern) { + return new AutoValue_HttpBindings_HttpBinding( + name, JavaStyle.toLowerCamelCase(name), isOptional, isRepeated, valuePattern); } // Do not forget to keep it in sync with equals() implementation. diff --git a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java index e4643de654..d98212ef6b 100644 --- a/src/main/java/com/google/api/generator/gapic/model/RegionTag.java +++ b/src/main/java/com/google/api/generator/gapic/model/RegionTag.java @@ -20,7 +20,6 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; -// TODO: alicejli edit RegionTag to match other languages /** * This model represents a code sample region tag. Matching region start and end region tag comments * are used to determine the boundaries of code snippets to be used in documentation. @@ -138,8 +137,7 @@ public String generate() { if (!apiVersion().isEmpty()) { rt = rt + apiVersion() + "_"; } - rt = rt.toLowerCase() + "generated_" + serviceName() + "_" + rpcName(); - // TODO: @alicejli overloadDisambiguation will need to be updated to match other languages + rt = rt + "generated_" + serviceName() + "_" + rpcName(); if (!overloadDisambiguation().isEmpty()) { rt = rt + "_" + overloadDisambiguation(); } @@ -149,7 +147,7 @@ public String generate() { rt = rt + "_sync"; } - return rt; + return rt.toLowerCase(); } public static CommentStatement generateTag( diff --git a/src/main/java/com/google/api/generator/gapic/model/Service.java b/src/main/java/com/google/api/generator/gapic/model/Service.java index 2e3a6be7df..34d3f97b25 100644 --- a/src/main/java/com/google/api/generator/gapic/model/Service.java +++ b/src/main/java/com/google/api/generator/gapic/model/Service.java @@ -16,10 +16,8 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.auto.value.AutoValue; -import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import java.util.List; import javax.annotation.Nullable; @@ -52,20 +50,6 @@ public boolean hasDescription() { return !Strings.isNullOrEmpty(description()); } - public String apiShortName() { - if (!Strings.isNullOrEmpty(defaultHost())) { - return parseApiShortName(defaultHost()); - } - return ""; - } - - public String apiVersion() { - if (!Strings.isNullOrEmpty(protoPakkage())) { - return parseApiVersion(protoPakkage()); - } - return ""; - } - public Method operationPollingMethod() { for (Method method : methods()) { if (method.isOperationPollingMethod()) { @@ -143,35 +127,4 @@ public abstract static class Builder { public abstract Service build(); } - - private static String parseApiVersion(String protoPackage) { - // parse protoPackage for apiVersion - String[] pakkage = protoPackage.split("\\."); - String apiVersion; - // e.g. v1, v2, v1beta1 - if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { - apiVersion = pakkage[pakkage.length - 1]; - } else { - apiVersion = ""; - } - return apiVersion; - } - - // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default - // endpoints like - // "us-east1-pubsub.googleapis.com". - private static String parseApiShortName(String defaultHost) { - // If the defaultHost is of the format "**.googleapis.com", take the name before the first - // period. - String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); - // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the - // first period and after the last dash to follow CSharp's implementation here: - // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 - apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); - // `iam-meta-api` service is an exceptional case and is handled as a one-off - if (defaultHost.contains("iam-meta-api")) { - apiShortName = "iam"; - } - return apiShortName; - } } diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java b/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java index 87bcd76abb..bead11e082 100644 --- a/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java +++ b/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java @@ -82,11 +82,6 @@ private static HttpBindings parseHttpRuleHelper( Map patternSampleValues = constructPathValuePatterns(pattern); // TODO: support nested message fields bindings - // Nested message fields bindings for query params are already supported as part of - // https://github.com/googleapis/gax-java/pull/1784, - // however we need to excludes fields that are already configured for path params and body, see - // https://github.com/googleapis/googleapis/blob/532289228eaebe77c42438f74b8a5afa85fee1b6/google/api/http.proto#L208 for details, - // the current logic does not exclude fields that are more than one level deep. String body = httpRule.getBody(); Set bodyParamNames; Set queryParamNames; @@ -138,9 +133,8 @@ private static Set validateAndConstructHttpBindings( String patternSampleValue = patternSampleValues != null ? patternSampleValues.get(paramName) : null; String[] subFields = paramName.split("\\."); - HttpBinding.Builder httpBindingBuilder = HttpBinding.builder().setName(paramName); if (inputMessage == null) { - httpBindings.add(httpBindingBuilder.setValuePattern(patternSampleValue).build()); + httpBindings.add(HttpBinding.create(paramName, false, false, patternSampleValue)); continue; } Message nestedMessage = inputMessage; @@ -162,7 +156,8 @@ private static Set validateAndConstructHttpBindings( } Field field = nestedMessage.fieldMap().get(subFieldName); httpBindings.add( - httpBindingBuilder.setValuePattern(patternSampleValue).setField(field).build()); + HttpBinding.create( + paramName, field.isProto3Optional(), field.isRepeated(), patternSampleValue)); } } } diff --git a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java index bd8d62afb7..07be47a996 100644 --- a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java +++ b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java @@ -363,32 +363,6 @@ public void writeVariableExprImports_nestedReference() { writerVisitor.write()); } - @Test - public void writeVariableExprImports_withAnnotations() { - Variable variable = - Variable.builder() - .setName("expr") - .setType(TypeNode.withReference(ConcreteReference.withClazz(Expr.class))) - .build(); - - VariableExpr variableExpr = - VariableExpr.builder() - .setVariable(variable) - .setIsDecl(true) - .setAnnotations( - Arrays.asList( - AnnotationNode.withType( - TypeNode.withReference(ConcreteReference.withClazz(Generated.class))))) - .build(); - - variableExpr.accept(writerVisitor); - assertEquals( - LineFormatter.lines( - "import com.google.api.generator.engine.ast.Expr;\n", - "import javax.annotation.Generated;\n\n"), - writerVisitor.write()); - } - @Test public void writeAnonymousClassExprImports() { // [Constructing] Function, MethodDefinition> diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java index d99325fbe8..4bbc779dcf 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java @@ -15,7 +15,6 @@ package com.google.api.generator.gapic.composer; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.ScopeNode; @@ -26,11 +25,11 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; -import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.Sample; 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 com.google.common.collect.ImmutableList; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; @@ -42,16 +41,9 @@ public class ComposerTest { private final Service echoProtoService = context.services().get(0); private final List clazzes = Arrays.asList( - GrpcServiceCallableFactoryClassComposer.instance() - .generate(context, echoProtoService) - .withApiShortName(echoProtoService.apiShortName()) - .withApiVersion(echoProtoService.apiVersion())); - private final Sample sample = - Sample.builder() - .setRegionTag( - RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build()) - .build(); - private List ListofSamples = Arrays.asList(new Sample[] {sample}); + GrpcServiceCallableFactoryClassComposer.instance().generate(context, echoProtoService)); + private final String protoPackage = context.gapicMetadata().getProtoPackage(); + private final List samples = clazzes.get(0).samples(); @Test public void gapicClass_addApacheLicense() { @@ -73,93 +65,59 @@ public void gapicClass_addApacheLicense() { @Test public void composeSamples_showcase() { - GapicClass testClass = clazzes.get(0).withSamples(ListofSamples); - List testClassList = Arrays.asList(new GapicClass[] {testClass}); + for (Sample sample : samples) { + assertEquals( + "File header will be empty before composing samples", + sample.fileHeader(), + ImmutableList.of()); + assertEquals( + "ApiShortName will be empty before composing samples", + sample.regionTag().apiShortName(), + ""); + assertEquals( + "ApiVersion will be empty before composing samples", sample.regionTag().apiVersion(), ""); + } List composedSamples = - Composer.prepareExecutableSamples(testClassList).get(0).samples(); + Composer.prepareExecutableSamples(clazzes, protoPackage).get(0).samples(); - assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { assertEquals( - "File header should be APACHE", - Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), - sample.fileHeader()); + "File header should be apache", + sample.fileHeader(), + Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT)); assertEquals( - "ApiShortName should be Localhost7469", - "Localhost7469", - sample.regionTag().apiShortName()); - assertEquals("ApiVersion should be V1Beta1", "V1Beta1", sample.regionTag().apiVersion()); + "ApiShortName should be showcase", sample.regionTag().apiShortName(), "showcase"); + assertEquals("ApiVersion should be v1beta1", sample.regionTag().apiVersion(), "v1beta1"); } } - @Test - public void gapicClass_addRegionTagAndHeaderToSample() { - Sample testSample; - testSample = Composer.addRegionTagAndHeaderToSample(sample, "showcase", "v1"); - assertEquals("Showcase", testSample.regionTag().apiShortName()); - assertEquals("V1", testSample.regionTag().apiVersion()); - assertEquals(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), testSample.fileHeader()); - } - @Test public void composeSamples_parseProtoPackage() { - - String defaultHost = "accessapproval.googleapis.com:443"; String protoPack = "google.cloud.accessapproval.v1"; - Service testService = - echoProtoService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); - List testClassList = getTestClassListFromService(testService); List composedSamples = - Composer.prepareExecutableSamples(testClassList).get(0).samples(); - - // If samples is empty, the test automatically passes without checking. - assertFalse(composedSamples.isEmpty()); + Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); for (Sample sample : composedSamples) { assertEquals( - "ApiShortName should be Accessapproval", + "ApiShortName should be accessapproval", sample.regionTag().apiShortName(), - "Accessapproval"); - assertEquals("ApiVersion should be V1", sample.regionTag().apiVersion(), "V1"); + "accessapproval"); + assertEquals("ApiVersion should be v1", sample.regionTag().apiVersion(), "v1"); } protoPack = "google.cloud.vision.v1p1beta1"; - defaultHost = "vision.googleapis.com"; - testService = - testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); - testClassList = getTestClassListFromService(testService); - composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); - // If samples is empty, the test automatically passes without checking. - assertFalse(composedSamples.isEmpty()); - + composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); for (Sample sample : composedSamples) { - assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision"); - assertEquals("ApiVersion should be V1P1Beta1", sample.regionTag().apiVersion(), "V1P1Beta1"); + assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision"); + assertEquals("ApiVersion should be v1p1beta1", sample.regionTag().apiVersion(), "v1p1beta1"); } protoPack = "google.cloud.vision"; - testService = - testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); - testClassList = getTestClassListFromService(testService); - composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); - // If samples is empty, the test automatically passes without checking. - assertFalse(composedSamples.isEmpty()); - + composedSamples = Composer.prepareExecutableSamples(clazzes, protoPack).get(0).samples(); for (Sample sample : composedSamples) { - assertEquals("ApiShortName should be Vision", sample.regionTag().apiShortName(), "Vision"); + assertEquals("ApiShortName should be vision", sample.regionTag().apiShortName(), "vision"); assertEquals("ApiVersion should be empty", sample.regionTag().apiVersion(), ""); } } - - private List getTestClassListFromService(Service testService) { - GapicClass testClass = - GrpcServiceCallableFactoryClassComposer.instance() - .generate(context, testService) - .withSamples(ListofSamples) - .withApiShortName(testService.apiShortName()) - .withApiVersion(testService.apiVersion()); - List testClassList = Arrays.asList(new GapicClass[] {testClass}); - return testClassList; - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java index c169c88eb3..fe00c3ca04 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java @@ -18,7 +18,8 @@ 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 java.util.*; +import java.util.Arrays; +import java.util.Collection; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -29,36 +30,11 @@ public class ServiceClientClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - { - "EchoClient", - GrpcTestProtoLoader.instance().parseShowcaseEcho(), - "localhost:7469", - "v1beta1" - }, - { - "DeprecatedServiceClient", - GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469", - "v1" - }, - { - "IdentityClient", - GrpcTestProtoLoader.instance().parseShowcaseIdentity(), - "localhost:7469", - "v1beta1" - }, - { - "BookshopClient", - GrpcTestProtoLoader.instance().parseBookshopService(), - "localhost:2665", - "v1beta1" - }, - { - "MessagingClient", - GrpcTestProtoLoader.instance().parseShowcaseMessaging(), - "localhost:7469", - "v1beta1" - }, + {"EchoClient", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, + {"DeprecatedServiceClient", GrpcTestProtoLoader.instance().parseDeprecatedService()}, + {"IdentityClient", GrpcTestProtoLoader.instance().parseShowcaseIdentity()}, + {"BookshopClient", GrpcTestProtoLoader.instance().parseBookshopService()}, + {"MessagingClient", GrpcTestProtoLoader.instance().parseShowcaseMessaging()}, }); } @@ -67,12 +43,6 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; - @Parameterized.Parameter(2) - public String apiShortNameExpected; - - @Parameterized.Parameter(3) - public String apiVersionExpected; - @Test public void generateServiceClientClasses() { Service service = context.services().get(0); @@ -81,7 +51,5 @@ public void generateServiceClientClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertGoldenSamples( this.getClass(), name, clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); - Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java index 1d245a7490..5857ef3352 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java @@ -31,18 +31,8 @@ public class ServiceSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - { - "EchoSettings", - TestProtoLoader.instance().parseShowcaseEcho(), - "localhost:7469", - "v1beta1" - }, - { - "DeprecatedServiceSettings", - TestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469", - "v1" - } + {"EchoSettings", TestProtoLoader.instance().parseShowcaseEcho()}, + {"DeprecatedServiceSettings", TestProtoLoader.instance().parseDeprecatedService()} }); } @@ -51,12 +41,6 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; - @Parameterized.Parameter(2) - public String apiShortNameExpected; - - @Parameterized.Parameter(3) - public String apiVersionExpected; - @Test public void generateServiceSettingsClasses() { Service service = context.services().get(0); @@ -68,7 +52,5 @@ public void generateServiceSettingsClasses() { "servicesettings", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); - Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java index 730136c083..bb0619d315 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java @@ -31,8 +31,8 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), "", ""}, - {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), "", ""} + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho()}, + {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService()} }); } @@ -41,12 +41,6 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; - @Parameterized.Parameter(2) - public String apiShortNameExpected; - - @Parameterized.Parameter(3) - public String apiVersionExpected; - @Test public void generateServiceStubClasses() { Service service = context.services().get(0); @@ -54,7 +48,5 @@ public void generateServiceStubClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); - Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java index 747b19b8e0..9a63099d7d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java @@ -30,30 +30,10 @@ public class ServiceStubSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - { - "LoggingServiceV2StubSettings", - GrpcTestProtoLoader.instance().parseLogging(), - "logging", - "v2" - }, - { - "PublisherStubSettings", - GrpcTestProtoLoader.instance().parsePubSubPublisher(), - "pubsub", - "v1" - }, - { - "EchoStubSettings", - GrpcTestProtoLoader.instance().parseShowcaseEcho(), - "localhost:7469", - "v1beta1" - }, - { - "DeprecatedServiceStubSettings", - GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469", - "v1" - } + {"LoggingServiceV2StubSettings", GrpcTestProtoLoader.instance().parseLogging()}, + {"PublisherStubSettings", GrpcTestProtoLoader.instance().parsePubSubPublisher()}, + {"EchoStubSettings", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, + {"DeprecatedServiceStubSettings", GrpcTestProtoLoader.instance().parseDeprecatedService()} }); } @@ -62,12 +42,6 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; - @Parameterized.Parameter(2) - public String apiShortNameExpected; - - @Parameterized.Parameter(3) - public String apiVersionExpected; - @Test public void generateServiceStubSettingsClasses() { Service service = context.services().get(0); @@ -79,7 +53,5 @@ public void generateServiceStubSettingsClasses() { "servicesettings/stub", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); - Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden index 87236a1311..a11e0c5ad1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_GetBook_async] +// [START goldensample_generated_bookshopclient_getbook_async] import com.google.api.core.ApiFuture; import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; @@ -48,4 +48,4 @@ public class AsyncGetBook { } } } -// [END goldensample_generated_Bookshop_GetBook_async] +// [END goldensample_generated_bookshopclient_getbook_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden index 346f1125da..c34c8e5ace 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_Create_SetCredentialsProvider_sync] +// [START goldensample_generated_bookshopclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.BookshopSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { BookshopClient bookshopClient = BookshopClient.create(bookshopSettings); } } -// [END goldensample_generated_Bookshop_Create_SetCredentialsProvider_sync] +// [END goldensample_generated_bookshopclient_create_setcredentialsprovider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden index 43cd64aa7c..5ab576b5ab 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_Create_SetEndpoint_sync] +// [START goldensample_generated_bookshopclient_create_setendpoint_sync] import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.BookshopSettings; import com.google.bookshop.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { BookshopClient bookshopClient = BookshopClient.create(bookshopSettings); } } -// [END goldensample_generated_Bookshop_Create_SetEndpoint_sync] +// [END goldensample_generated_bookshopclient_create_setendpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden index bd89a8fc05..9bcbe39862 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_GetBook_sync] +// [START goldensample_generated_bookshopclient_getbook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import com.google.bookshop.v1beta1.GetBookRequest; @@ -45,4 +45,4 @@ public class SyncGetBook { } } } -// [END goldensample_generated_Bookshop_GetBook_sync] +// [END goldensample_generated_bookshopclient_getbook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden index 31c6a24d01..698f2a1138 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_GetBook_IntListbook_sync] +// [START goldensample_generated_bookshopclient_getbook_intlistbook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import java.util.ArrayList; @@ -41,4 +41,4 @@ public class SyncGetBookIntListbook { } } } -// [END goldensample_generated_Bookshop_GetBook_IntListbook_sync] +// [END goldensample_generated_bookshopclient_getbook_intlistbook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden index f2d3903e1b..c893608c2e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden @@ -16,7 +16,7 @@ package com.google.bookshop.v1beta1.samples; -// [START goldensample_generated_Bookshop_GetBook_StringListbook_sync] +// [START goldensample_generated_bookshopclient_getbook_stringlistbook_sync] import com.google.bookshop.v1beta1.Book; import com.google.bookshop.v1beta1.BookshopClient; import java.util.ArrayList; @@ -41,4 +41,4 @@ public class SyncGetBookStringListbook { } } } -// [END goldensample_generated_Bookshop_GetBook_StringListbook_sync] +// [END goldensample_generated_bookshopclient_getbook_stringlistbook_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden index ea0ae6c62d..c47156c7d9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_FastFibonacci_async] +// [START goldensample_generated_deprecatedserviceclient_fastfibonacci_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; @@ -42,4 +42,4 @@ public class AsyncFastFibonacci { } } } -// [END goldensample_generated_DeprecatedService_FastFibonacci_async] +// [END goldensample_generated_deprecatedserviceclient_fastfibonacci_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden index 3e4f69d714..fdb781354b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_SlowFibonacci_async] +// [START goldensample_generated_deprecatedserviceclient_slowfibonacci_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; @@ -42,4 +42,4 @@ public class AsyncSlowFibonacci { } } } -// [END goldensample_generated_DeprecatedService_SlowFibonacci_async] +// [END goldensample_generated_deprecatedserviceclient_slowfibonacci_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden index 34f20df610..2d9e73b891 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_Create_SetCredentialsProvider_sync] +// [START goldensample_generated_deprecatedserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.DeprecatedServiceSettings; @@ -42,4 +42,4 @@ public class SyncCreateSetCredentialsProvider { DeprecatedServiceClient.create(deprecatedServiceSettings); } } -// [END goldensample_generated_DeprecatedService_Create_SetCredentialsProvider_sync] +// [END goldensample_generated_deprecatedserviceclient_create_setcredentialsprovider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden index 8d5f08f8af..24400c927b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_Create_SetEndpoint_sync] +// [START goldensample_generated_deprecatedserviceclient_create_setendpoint_sync] import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.DeprecatedServiceSettings; import com.google.testdata.v1.myEndpoint; @@ -39,4 +39,4 @@ public class SyncCreateSetEndpoint { DeprecatedServiceClient.create(deprecatedServiceSettings); } } -// [END goldensample_generated_DeprecatedService_Create_SetEndpoint_sync] +// [END goldensample_generated_deprecatedserviceclient_create_setendpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden index e067991442..e05200321d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_FastFibonacci_sync] +// [START goldensample_generated_deprecatedserviceclient_fastfibonacci_sync] import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.FibonacciRequest; @@ -39,4 +39,4 @@ public class SyncFastFibonacci { } } } -// [END goldensample_generated_DeprecatedService_FastFibonacci_sync] +// [END goldensample_generated_deprecatedserviceclient_fastfibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden index a6dfe7ece4..d9f5432437 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedService_SlowFibonacci_sync] +// [START goldensample_generated_deprecatedserviceclient_slowfibonacci_sync] import com.google.protobuf.Empty; import com.google.testdata.v1.DeprecatedServiceClient; import com.google.testdata.v1.FibonacciRequest; @@ -39,4 +39,4 @@ public class SyncSlowFibonacci { } } } -// [END goldensample_generated_DeprecatedService_SlowFibonacci_sync] +// [END goldensample_generated_deprecatedserviceclient_slowfibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden index fcb7690270..c62c2f43d8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Block_async] +// [START goldensample_generated_echoclient_block_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.BlockRequest; import com.google.showcase.v1beta1.BlockResponse; @@ -42,4 +42,4 @@ public class AsyncBlock { } } } -// [END goldensample_generated_Echo_Block_async] +// [END goldensample_generated_echoclient_block_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden index 2ef5f41da6..8b359c46f5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Chat_async] +// [START goldensample_generated_echoclient_chat_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -53,4 +53,4 @@ public class AsyncChat { } } } -// [END goldensample_generated_Echo_Chat_async] +// [END goldensample_generated_echoclient_chat_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden index 4e8eaa63f4..90331b833e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_ChatAgain_async] +// [START goldensample_generated_echoclient_chatagain_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -53,4 +53,4 @@ public class AsyncChatAgain { } } } -// [END goldensample_generated_Echo_ChatAgain_async] +// [END goldensample_generated_echoclient_chatagain_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden index b2ff87a8c4..d51c9aeae2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Collect_async] +// [START goldensample_generated_echoclient_collect_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -68,4 +68,4 @@ public class AsyncCollect { } } } -// [END goldensample_generated_Echo_Collect_async] +// [END goldensample_generated_echoclient_collect_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden index 8a13eb4386..a2886c0001 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_CollideName_async] +// [START goldensample_generated_echoclient_collidename_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -51,4 +51,4 @@ public class AsyncCollideName { } } } -// [END goldensample_generated_Echo_CollideName_async] +// [END goldensample_generated_echoclient_collidename_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden index 1188e05d7e..4ee2bc4cd1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_async] +// [START goldensample_generated_echoclient_echo_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; @@ -51,4 +51,4 @@ public class AsyncEcho { } } } -// [END goldensample_generated_Echo_Echo_async] +// [END goldensample_generated_echoclient_echo_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden index 3d804cf625..51d367798c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Expand_async] +// [START goldensample_generated_echoclient_expand_async] import com.google.api.gax.rpc.ServerStream; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -44,4 +44,4 @@ public class AsyncExpand { } } } -// [END goldensample_generated_Echo_Expand_async] +// [END goldensample_generated_echoclient_expand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden index 653f0c2489..0e8b197ad3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_PagedExpand_async] +// [START goldensample_generated_echoclient_pagedexpand_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -49,4 +49,4 @@ public class AsyncPagedExpand { } } } -// [END goldensample_generated_Echo_PagedExpand_async] +// [END goldensample_generated_echoclient_pagedexpand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden index 854477fe8f..0ae0cab7d6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_PagedExpand_Paged_async] +// [START goldensample_generated_echoclient_pagedexpand_paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -57,4 +57,4 @@ public class AsyncPagedExpandPaged { } } } -// [END goldensample_generated_Echo_PagedExpand_Paged_async] +// [END goldensample_generated_echoclient_pagedexpand_paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden index d0decc78d6..e944abb1a3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_SimplePagedExpand_async] +// [START goldensample_generated_echoclient_simplepagedexpand_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -50,4 +50,4 @@ public class AsyncSimplePagedExpand { } } } -// [END goldensample_generated_Echo_SimplePagedExpand_async] +// [END goldensample_generated_echoclient_simplepagedexpand_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden index 0ab1bb2620..058295f62e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_SimplePagedExpand_Paged_async] +// [START goldensample_generated_echoclient_simplepagedexpand_paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -57,4 +57,4 @@ public class AsyncSimplePagedExpandPaged { } } } -// [END goldensample_generated_Echo_SimplePagedExpand_Paged_async] +// [END goldensample_generated_echoclient_simplepagedexpand_paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden index b433d3de7b..0bb588d43a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Wait_async] +// [START goldensample_generated_echoclient_wait_async] import com.google.api.core.ApiFuture; import com.google.longrunning.Operation; import com.google.showcase.v1beta1.EchoClient; @@ -42,4 +42,4 @@ public class AsyncWait { } } } -// [END goldensample_generated_Echo_Wait_async] +// [END goldensample_generated_echoclient_wait_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden index ee7219e6a5..205131670a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Wait_LRO_async] +// [START goldensample_generated_echoclient_wait_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitMetadata; @@ -44,4 +44,4 @@ public class AsyncWaitLRO { } } } -// [END goldensample_generated_Echo_Wait_LRO_async] +// [END goldensample_generated_echoclient_wait_lro_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden index 49083f06a5..f77e29adf9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Block_sync] +// [START goldensample_generated_echoclient_block_sync] import com.google.showcase.v1beta1.BlockRequest; import com.google.showcase.v1beta1.BlockResponse; import com.google.showcase.v1beta1.EchoClient; @@ -39,4 +39,4 @@ public class SyncBlock { } } } -// [END goldensample_generated_Echo_Block_sync] +// [END goldensample_generated_echoclient_block_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden index f54228fe7b..5d412efe85 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_CollideName_sync] +// [START goldensample_generated_echoclient_collidename_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; import com.google.showcase.v1beta1.Foobar; @@ -48,4 +48,4 @@ public class SyncCollideName { } } } -// [END goldensample_generated_Echo_CollideName_sync] +// [END goldensample_generated_echoclient_collidename_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden index 137d71af02..fbcaeceee3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Create_SetCredentialsProvider_sync] +// [START goldensample_generated_echoclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { EchoClient echoClient = EchoClient.create(echoSettings); } } -// [END goldensample_generated_Echo_Create_SetCredentialsProvider_sync] +// [END goldensample_generated_echoclient_create_setcredentialsprovider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden index b6a2ea7d5b..7e5bdd85c8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Create_SetEndpoint_sync] +// [START goldensample_generated_echoclient_create_setendpoint_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import com.google.showcase.v1beta1.myEndpoint; @@ -37,4 +37,4 @@ public class SyncCreateSetEndpoint { EchoClient echoClient = EchoClient.create(echoSettings); } } -// [END goldensample_generated_Echo_Create_SetEndpoint_sync] +// [END goldensample_generated_echoclient_create_setendpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden index c17dbf2e4a..404cd05a88 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_sync] +// [START goldensample_generated_echoclient_echo_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoRequest; import com.google.showcase.v1beta1.EchoResponse; @@ -48,4 +48,4 @@ public class SyncEcho { } } } -// [END goldensample_generated_Echo_Echo_sync] +// [END goldensample_generated_echoclient_echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden index dd60585688..99d0105b4d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_Foobarname_sync] +// [START goldensample_generated_echoclient_echo_foobarname_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoFoobarname { } } } -// [END goldensample_generated_Echo_Echo_Foobarname_sync] +// [END goldensample_generated_echoclient_echo_foobarname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden index 7876817dac..1939f2941f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_Noargs_sync] +// [START goldensample_generated_echoclient_echo_noargs_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -37,4 +37,4 @@ public class SyncEchoNoargs { } } } -// [END goldensample_generated_Echo_Echo_Noargs_sync] +// [END goldensample_generated_echoclient_echo_noargs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden index 8f06e73ae8..a6bff404df 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_Resourcename_sync] +// [START goldensample_generated_echoclient_echo_resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -40,4 +40,4 @@ public class SyncEchoResourcename { } } } -// [END goldensample_generated_Echo_Echo_Resourcename_sync] +// [END goldensample_generated_echoclient_echo_resourcename_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden index 292f2fd990..b9471f8203 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_Status_sync] +// [START goldensample_generated_echoclient_echo_status_sync] import com.google.rpc.Status; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -39,4 +39,4 @@ public class SyncEchoStatus { } } } -// [END goldensample_generated_Echo_Echo_Status_sync] +// [END goldensample_generated_echoclient_echo_status_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden index 32f664871e..bb9c0bc308 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_String_sync] +// [START goldensample_generated_echoclient_echo_string_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -38,4 +38,4 @@ public class SyncEchoString { } } } -// [END goldensample_generated_Echo_Echo_String_sync] +// [END goldensample_generated_echoclient_echo_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden index 96630803f2..8bc3c4036c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_String1_sync] +// [START goldensample_generated_echoclient_echo_string1_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoString1 { } } } -// [END goldensample_generated_Echo_Echo_String1_sync] +// [END goldensample_generated_echoclient_echo_string1_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden index eccc2e54f9..268b1c769e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_String2_sync] +// [START goldensample_generated_echoclient_echo_string2_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.FoobarName; @@ -39,4 +39,4 @@ public class SyncEchoString2 { } } } -// [END goldensample_generated_Echo_Echo_String2_sync] +// [END goldensample_generated_echoclient_echo_string2_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden index 966053a99d..5a62b9f4ad 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Echo_StringSeverity_sync] +// [START goldensample_generated_echoclient_echo_stringseverity_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.Severity; @@ -40,4 +40,4 @@ public class SyncEchoStringSeverity { } } } -// [END goldensample_generated_Echo_Echo_StringSeverity_sync] +// [END goldensample_generated_echoclient_echo_stringseverity_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden index b30d626699..4ae90f53cc 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_PagedExpand_sync] +// [START goldensample_generated_echoclient_pagedexpand_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.PagedExpandRequest; @@ -46,4 +46,4 @@ public class SyncPagedExpand { } } } -// [END goldensample_generated_Echo_PagedExpand_sync] +// [END goldensample_generated_echoclient_pagedexpand_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden index ba9caf6133..11bc4352c5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_SimplePagedExpand_sync] +// [START goldensample_generated_echoclient_simplepagedexpand_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; import com.google.showcase.v1beta1.PagedExpandRequest; @@ -46,4 +46,4 @@ public class SyncSimplePagedExpand { } } } -// [END goldensample_generated_Echo_SimplePagedExpand_sync] +// [END goldensample_generated_echoclient_simplepagedexpand_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden index 050f9b3d74..40ef059d89 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_SimplePagedExpand_Noargs_sync] +// [START goldensample_generated_echoclient_simplepagedexpand_noargs_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoResponse; @@ -39,4 +39,4 @@ public class SyncSimplePagedExpandNoargs { } } } -// [END goldensample_generated_Echo_SimplePagedExpand_Noargs_sync] +// [END goldensample_generated_echoclient_simplepagedexpand_noargs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden index 426785177c..07679a60e1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Wait_sync] +// [START goldensample_generated_echoclient_wait_sync] import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitRequest; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWait { } } } -// [END goldensample_generated_Echo_Wait_sync] +// [END goldensample_generated_echoclient_wait_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden index c045e0e3ec..9bec9d30ef 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Wait_Duration_sync] +// [START goldensample_generated_echoclient_wait_duration_sync] import com.google.protobuf.Duration; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWaitDuration { } } } -// [END goldensample_generated_Echo_Wait_Duration_sync] +// [END goldensample_generated_echoclient_wait_duration_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden index c4cfdca153..58e6f3464c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Echo_Wait_Timestamp_sync] +// [START goldensample_generated_echoclient_wait_timestamp_sync] import com.google.protobuf.Timestamp; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.WaitResponse; @@ -39,4 +39,4 @@ public class SyncWaitTimestamp { } } } -// [END goldensample_generated_Echo_Wait_Timestamp_sync] +// [END goldensample_generated_echoclient_wait_timestamp_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden index 42b3f90307..5746bce725 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_CreateUser_async] +// [START goldensample_generated_identityclient_createuser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.CreateUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -47,4 +47,4 @@ public class AsyncCreateUser { } } } -// [END goldensample_generated_Identity_CreateUser_async] +// [END goldensample_generated_identityclient_createuser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden index 09d4bf8625..e2a2d79316 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_DeleteUser_async] +// [START goldensample_generated_identityclient_deleteuser_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteUserRequest; @@ -44,4 +44,4 @@ public class AsyncDeleteUser { } } } -// [END goldensample_generated_Identity_DeleteUser_async] +// [END goldensample_generated_identityclient_deleteuser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden index ab82342d69..fe848f43d2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_GetUser_async] +// [START goldensample_generated_identityclient_getuser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.GetUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -44,4 +44,4 @@ public class AsyncGetUser { } } } -// [END goldensample_generated_Identity_GetUser_async] +// [END goldensample_generated_identityclient_getuser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden index 07b5e7b761..a5aa944c8f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_ListUsers_async] +// [START goldensample_generated_identityclient_listusers_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; @@ -48,4 +48,4 @@ public class AsyncListUsers { } } } -// [END goldensample_generated_Identity_ListUsers_async] +// [END goldensample_generated_identityclient_listusers_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden index 2dd52c01a9..9b7cafa65d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_ListUsers_Paged_async] +// [START goldensample_generated_identityclient_listusers_paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; @@ -56,4 +56,4 @@ public class AsyncListUsersPaged { } } } -// [END goldensample_generated_Identity_ListUsers_Paged_async] +// [END goldensample_generated_identityclient_listusers_paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden index 6a77b3f29d..be44912297 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_UpdateUser_async] +// [START goldensample_generated_identityclient_updateuser_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UpdateUserRequest; @@ -43,4 +43,4 @@ public class AsyncUpdateUser { } } } -// [END goldensample_generated_Identity_UpdateUser_async] +// [END goldensample_generated_identityclient_updateuser_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden index 170fb27fb1..f859c452de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_Create_SetCredentialsProvider_sync] +// [START goldensample_generated_identityclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.IdentitySettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { IdentityClient identityClient = IdentityClient.create(identitySettings); } } -// [END goldensample_generated_Identity_Create_SetCredentialsProvider_sync] +// [END goldensample_generated_identityclient_create_setcredentialsprovider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden index 33dd94a49b..015f9dfcd7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_Create_SetEndpoint_sync] +// [START goldensample_generated_identityclient_create_setendpoint_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.IdentitySettings; import com.google.showcase.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { IdentityClient identityClient = IdentityClient.create(identitySettings); } } -// [END goldensample_generated_Identity_Create_SetEndpoint_sync] +// [END goldensample_generated_identityclient_create_setendpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden index 7fb81d997e..7d8c03e141 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_CreateUser_sync] +// [START goldensample_generated_identityclient_createuser_sync] import com.google.showcase.v1beta1.CreateUserRequest; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; @@ -44,4 +44,4 @@ public class SyncCreateUser { } } } -// [END goldensample_generated_Identity_CreateUser_sync] +// [END goldensample_generated_identityclient_createuser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden index 39feaa06d3..d8b266a31a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_CreateUser_StringStringString_sync] +// [START goldensample_generated_identityclient_createuser_stringstringstring_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -41,4 +41,4 @@ public class SyncCreateUserStringStringString { } } } -// [END goldensample_generated_Identity_CreateUser_StringStringString_sync] +// [END goldensample_generated_identityclient_createuser_stringstringstring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden index 338a1262a2..6556a596f1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_CreateUser_StringStringStringIntStringBooleanDouble_sync] +// [START goldensample_generated_identityclient_createuser_stringstringstringintstringbooleandouble_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -47,4 +47,4 @@ public class SyncCreateUserStringStringStringIntStringBooleanDouble { } } } -// [END goldensample_generated_Identity_CreateUser_StringStringStringIntStringBooleanDouble_sync] +// [END goldensample_generated_identityclient_createuser_stringstringstringintstringbooleandouble_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden index e56b757fe6..ac1a283fd2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_CreateUser_StringStringStringStringStringIntStringStringStringString_sync] +// [START goldensample_generated_identityclient_createuser_stringstringstringstringstringintstringstringstringstring_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -60,4 +60,4 @@ public class SyncCreateUserStringStringStringStringStringIntStringStringStringSt } } } -// [END goldensample_generated_Identity_CreateUser_StringStringStringStringStringIntStringStringStringString_sync] +// [END goldensample_generated_identityclient_createuser_stringstringstringstringstringintstringstringstringstring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden index 1142599cce..53c45c3cbb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_DeleteUser_sync] +// [START goldensample_generated_identityclient_deleteuser_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteUserRequest; import com.google.showcase.v1beta1.IdentityClient; @@ -41,4 +41,4 @@ public class SyncDeleteUser { } } } -// [END goldensample_generated_Identity_DeleteUser_sync] +// [END goldensample_generated_identityclient_deleteuser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden index a809efb619..eece238c02 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_DeleteUser_String_sync] +// [START goldensample_generated_identityclient_deleteuser_string_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncDeleteUserString { } } } -// [END goldensample_generated_Identity_DeleteUser_String_sync] +// [END goldensample_generated_identityclient_deleteuser_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden index 742b1e748c..b5be27d6ef 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUserUsername.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_DeleteUser_Username_sync] +// [START goldensample_generated_identityclient_deleteuser_username_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncDeleteUserUsername { } } } -// [END goldensample_generated_Identity_DeleteUser_Username_sync] +// [END goldensample_generated_identityclient_deleteuser_username_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden index e3bf802301..b1365f3b99 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_GetUser_sync] +// [START goldensample_generated_identityclient_getuser_sync] import com.google.showcase.v1beta1.GetUserRequest; import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; @@ -41,4 +41,4 @@ public class SyncGetUser { } } } -// [END goldensample_generated_Identity_GetUser_sync] +// [END goldensample_generated_identityclient_getuser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden index 73c4cf2bba..44a6a17256 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_GetUser_String_sync] +// [START goldensample_generated_identityclient_getuser_string_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncGetUserString { } } } -// [END goldensample_generated_Identity_GetUser_String_sync] +// [END goldensample_generated_identityclient_getuser_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden index 4af40f648d..409787850e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncGetUserUsername.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_GetUser_Username_sync] +// [START goldensample_generated_identityclient_getuser_username_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.User; import com.google.showcase.v1beta1.UserName; @@ -39,4 +39,4 @@ public class SyncGetUserUsername { } } } -// [END goldensample_generated_Identity_GetUser_Username_sync] +// [END goldensample_generated_identityclient_getuser_username_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden index d111584331..1fa89b2cf7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncListUsers.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_ListUsers_sync] +// [START goldensample_generated_identityclient_listusers_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.ListUsersRequest; import com.google.showcase.v1beta1.User; @@ -45,4 +45,4 @@ public class SyncListUsers { } } } -// [END goldensample_generated_Identity_ListUsers_sync] +// [END goldensample_generated_identityclient_listusers_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden index beca349fe1..919953f762 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncUpdateUser.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Identity_UpdateUser_sync] +// [START goldensample_generated_identityclient_updateuser_sync] import com.google.showcase.v1beta1.IdentityClient; import com.google.showcase.v1beta1.UpdateUserRequest; import com.google.showcase.v1beta1.User; @@ -40,4 +40,4 @@ public class SyncUpdateUser { } } } -// [END goldensample_generated_Identity_UpdateUser_sync] +// [END goldensample_generated_identityclient_updateuser_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden index 1527fbf21c..7c844cce85 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncConnect.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_Connect_async] +// [START goldensample_generated_messagingclient_connect_async] import com.google.api.gax.rpc.BidiStream; import com.google.showcase.v1beta1.ConnectRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -45,4 +45,4 @@ public class AsyncConnect { } } } -// [END goldensample_generated_Messaging_Connect_async] +// [END goldensample_generated_messagingclient_connect_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden index 7d4dedad14..f015b74a58 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_async] +// [START goldensample_generated_messagingclient_createblurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; @@ -47,4 +47,4 @@ public class AsyncCreateBlurb { } } } -// [END goldensample_generated_Messaging_CreateBlurb_async] +// [END goldensample_generated_messagingclient_createblurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden index 0b97e48893..e0dc0aedac 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncCreateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateRoom_async] +// [START goldensample_generated_messagingclient_createroom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.CreateRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -43,4 +43,4 @@ public class AsyncCreateRoom { } } } -// [END goldensample_generated_Messaging_CreateRoom_async] +// [END goldensample_generated_messagingclient_createroom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden index 541b576c49..8eabcc893a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteBlurb_async] +// [START goldensample_generated_messagingclient_deleteblurb_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; @@ -46,4 +46,4 @@ public class AsyncDeleteBlurb { } } } -// [END goldensample_generated_Messaging_DeleteBlurb_async] +// [END goldensample_generated_messagingclient_deleteblurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden index a848b99195..ebe5be44c2 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncDeleteRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteRoom_async] +// [START goldensample_generated_messagingclient_deleteroom_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteRoomRequest; @@ -44,4 +44,4 @@ public class AsyncDeleteRoom { } } } -// [END goldensample_generated_Messaging_DeleteRoom_async] +// [END goldensample_generated_messagingclient_deleteroom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden index 91561164d4..627465df2d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetBlurb_async] +// [START goldensample_generated_messagingclient_getblurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; @@ -46,4 +46,4 @@ public class AsyncGetBlurb { } } } -// [END goldensample_generated_Messaging_GetBlurb_async] +// [END goldensample_generated_messagingclient_getblurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden index e18adcb4fe..caa0b727de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncGetRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetRoom_async] +// [START goldensample_generated_messagingclient_getroom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.GetRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -44,4 +44,4 @@ public class AsyncGetRoom { } } } -// [END goldensample_generated_Messaging_GetRoom_async] +// [END goldensample_generated_messagingclient_getroom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden index f61cbee5ec..1f2eb73d9d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_async] +// [START goldensample_generated_messagingclient_listblurbs_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; @@ -50,4 +50,4 @@ public class AsyncListBlurbs { } } } -// [END goldensample_generated_Messaging_ListBlurbs_async] +// [END goldensample_generated_messagingclient_listblurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden index 261b3be58b..37928394c7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListBlurbsPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_Paged_async] +// [START goldensample_generated_messagingclient_listblurbs_paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; @@ -58,4 +58,4 @@ public class AsyncListBlurbsPaged { } } } -// [END goldensample_generated_Messaging_ListBlurbs_Paged_async] +// [END goldensample_generated_messagingclient_listblurbs_paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden index 0fa5c5dd31..a658df0fae 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRooms.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListRooms_async] +// [START goldensample_generated_messagingclient_listrooms_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -48,4 +48,4 @@ public class AsyncListRooms { } } } -// [END goldensample_generated_Messaging_ListRooms_async] +// [END goldensample_generated_messagingclient_listrooms_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden index 83a9c04205..58686d44a7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncListRoomsPaged.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListRooms_Paged_async] +// [START goldensample_generated_messagingclient_listrooms_paged_async] import com.google.common.base.Strings; import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.ListRoomsResponse; @@ -56,4 +56,4 @@ public class AsyncListRoomsPaged { } } } -// [END goldensample_generated_Messaging_ListRooms_Paged_async] +// [END goldensample_generated_messagingclient_listrooms_paged_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden index a492728b11..6161b2e104 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_SearchBlurbs_async] +// [START goldensample_generated_messagingclient_searchblurbs_async] import com.google.api.core.ApiFuture; import com.google.longrunning.Operation; import com.google.showcase.v1beta1.MessagingClient; @@ -49,4 +49,4 @@ public class AsyncSearchBlurbs { } } } -// [END goldensample_generated_Messaging_SearchBlurbs_async] +// [END goldensample_generated_messagingclient_searchblurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden index c4db52aceb..73dac257ea 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSearchBlurbsLRO.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_SearchBlurbs_LRO_async] +// [START goldensample_generated_messagingclient_searchblurbs_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -51,4 +51,4 @@ public class AsyncSearchBlurbsLRO { } } } -// [END goldensample_generated_Messaging_SearchBlurbs_LRO_async] +// [END goldensample_generated_messagingclient_searchblurbs_lro_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden index 9275afa82b..6f608c23dc 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncSendBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_SendBlurbs_async] +// [START goldensample_generated_messagingclient_sendblurbs_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; @@ -65,4 +65,4 @@ public class AsyncSendBlurbs { } } } -// [END goldensample_generated_Messaging_SendBlurbs_async] +// [END goldensample_generated_messagingclient_sendblurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden index eeefc7952e..6588736a1d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncStreamBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_StreamBlurbs_async] +// [START goldensample_generated_messagingclient_streamblurbs_async] import com.google.api.gax.rpc.ServerStream; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -46,4 +46,4 @@ public class AsyncStreamBlurbs { } } } -// [END goldensample_generated_Messaging_StreamBlurbs_async] +// [END goldensample_generated_messagingclient_streamblurbs_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden index f7b197c194..c7e73b8638 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_UpdateBlurb_async] +// [START goldensample_generated_messagingclient_updateblurb_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -43,4 +43,4 @@ public class AsyncUpdateBlurb { } } } -// [END goldensample_generated_Messaging_UpdateBlurb_async] +// [END goldensample_generated_messagingclient_updateblurb_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden index 7bdf9bed17..c8bc11c5ba 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/AsyncUpdateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_UpdateRoom_async] +// [START goldensample_generated_messagingclient_updateroom_async] import com.google.api.core.ApiFuture; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -43,4 +43,4 @@ public class AsyncUpdateRoom { } } } -// [END goldensample_generated_Messaging_UpdateRoom_async] +// [END goldensample_generated_messagingclient_updateroom_async] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden index 57d0f0c180..00fb6d9940 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_sync] +// [START goldensample_generated_messagingclient_createblurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.CreateBlurbRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -44,4 +44,4 @@ public class SyncCreateBlurb { } } } -// [END goldensample_generated_Messaging_CreateBlurb_sync] +// [END goldensample_generated_messagingclient_createblurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden index ab5a62701c..f9d342accf 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_ProfilenameBytestring_sync] +// [START goldensample_generated_messagingclient_createblurb_profilenamebytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbProfilenameBytestring { } } } -// [END goldensample_generated_Messaging_CreateBlurb_ProfilenameBytestring_sync] +// [END goldensample_generated_messagingclient_createblurb_profilenamebytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden index a7efb77b5d..f165c7ef76 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbProfilenameString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_ProfilenameString_sync] +// [START goldensample_generated_messagingclient_createblurb_profilenamestring_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbProfilenameString { } } } -// [END goldensample_generated_Messaging_CreateBlurb_ProfilenameString_sync] +// [END goldensample_generated_messagingclient_createblurb_profilenamestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden index 143145ac95..2818243a50 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_RoomnameBytestring_sync] +// [START goldensample_generated_messagingclient_createblurb_roomnamebytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbRoomnameBytestring { } } } -// [END goldensample_generated_Messaging_CreateBlurb_RoomnameBytestring_sync] +// [END goldensample_generated_messagingclient_createblurb_roomnamebytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden index 8b7d8c6bbf..f05bd4f87b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbRoomnameString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_RoomnameString_sync] +// [START goldensample_generated_messagingclient_createblurb_roomnamestring_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbRoomnameString { } } } -// [END goldensample_generated_Messaging_CreateBlurb_RoomnameString_sync] +// [END goldensample_generated_messagingclient_createblurb_roomnamestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden index 08e2fc9a9b..3e630a4b15 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringBytestring.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_StringBytestring_sync] +// [START goldensample_generated_messagingclient_createblurb_stringbytestring_sync] import com.google.protobuf.ByteString; import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncCreateBlurbStringBytestring { } } } -// [END goldensample_generated_Messaging_CreateBlurb_StringBytestring_sync] +// [END goldensample_generated_messagingclient_createblurb_stringbytestring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden index f77ae6eb0f..562d27535a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateBlurbStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateBlurb_StringString_sync] +// [START goldensample_generated_messagingclient_createblurb_stringstring_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -40,4 +40,4 @@ public class SyncCreateBlurbStringString { } } } -// [END goldensample_generated_Messaging_CreateBlurb_StringString_sync] +// [END goldensample_generated_messagingclient_createblurb_stringstring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden index f1ac7b0bf8..57b517225b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateRoom_sync] +// [START goldensample_generated_messagingclient_createroom_sync] import com.google.showcase.v1beta1.CreateRoomRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -40,4 +40,4 @@ public class SyncCreateRoom { } } } -// [END goldensample_generated_Messaging_CreateRoom_sync] +// [END goldensample_generated_messagingclient_createroom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden index 05a335d704..ebcc0cc72d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateRoomStringString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_CreateRoom_StringString_sync] +// [START goldensample_generated_messagingclient_createroom_stringstring_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -39,4 +39,4 @@ public class SyncCreateRoomStringString { } } } -// [END goldensample_generated_Messaging_CreateRoom_StringString_sync] +// [END goldensample_generated_messagingclient_createroom_stringstring_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden index 2707298f00..ae4425a5e1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetCredentialsProvider.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_Create_SetCredentialsProvider_sync] +// [START goldensample_generated_messagingclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.MessagingSettings; @@ -41,4 +41,4 @@ public class SyncCreateSetCredentialsProvider { MessagingClient messagingClient = MessagingClient.create(messagingSettings); } } -// [END goldensample_generated_Messaging_Create_SetCredentialsProvider_sync] +// [END goldensample_generated_messagingclient_create_setcredentialsprovider_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden index 53141d54ff..8bc4e45e0b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncCreateSetEndpoint.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_Create_SetEndpoint_sync] +// [START goldensample_generated_messagingclient_create_setendpoint_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.MessagingSettings; import com.google.showcase.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public class SyncCreateSetEndpoint { MessagingClient messagingClient = MessagingClient.create(messagingSettings); } } -// [END goldensample_generated_Messaging_Create_SetEndpoint_sync] +// [END goldensample_generated_messagingclient_create_setendpoint_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden index 16d8a41623..c641dd9272 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteBlurb_sync] +// [START goldensample_generated_messagingclient_deleteblurb_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.DeleteBlurbRequest; @@ -43,4 +43,4 @@ public class SyncDeleteBlurb { } } } -// [END goldensample_generated_Messaging_DeleteBlurb_sync] +// [END goldensample_generated_messagingclient_deleteblurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden index 752875d995..f6a585d8be 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbBlurbname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteBlurb_Blurbname_sync] +// [START goldensample_generated_messagingclient_deleteblurb_blurbname_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -39,4 +39,4 @@ public class SyncDeleteBlurbBlurbname { } } } -// [END goldensample_generated_Messaging_DeleteBlurb_Blurbname_sync] +// [END goldensample_generated_messagingclient_deleteblurb_blurbname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden index c52c8d070f..16378885d7 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteBlurbString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteBlurb_String_sync] +// [START goldensample_generated_messagingclient_deleteblurb_string_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -40,4 +40,4 @@ public class SyncDeleteBlurbString { } } } -// [END goldensample_generated_Messaging_DeleteBlurb_String_sync] +// [END goldensample_generated_messagingclient_deleteblurb_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden index 621d024d15..23baa1c773 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteRoom_sync] +// [START goldensample_generated_messagingclient_deleteroom_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.DeleteRoomRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -41,4 +41,4 @@ public class SyncDeleteRoom { } } } -// [END goldensample_generated_Messaging_DeleteRoom_sync] +// [END goldensample_generated_messagingclient_deleteroom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden index bd203c1483..91d32081b9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteRoom_Roomname_sync] +// [START goldensample_generated_messagingclient_deleteroom_roomname_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncDeleteRoomRoomname { } } } -// [END goldensample_generated_Messaging_DeleteRoom_Roomname_sync] +// [END goldensample_generated_messagingclient_deleteroom_roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden index d65c2b43dd..b9e4c5883d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncDeleteRoomString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_DeleteRoom_String_sync] +// [START goldensample_generated_messagingclient_deleteroom_string_sync] import com.google.protobuf.Empty; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncDeleteRoomString { } } } -// [END goldensample_generated_Messaging_DeleteRoom_String_sync] +// [END goldensample_generated_messagingclient_deleteroom_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden index 16570a645d..0983642a83 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetBlurb_sync] +// [START goldensample_generated_messagingclient_getblurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.GetBlurbRequest; @@ -43,4 +43,4 @@ public class SyncGetBlurb { } } } -// [END goldensample_generated_Messaging_GetBlurb_sync] +// [END goldensample_generated_messagingclient_getblurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden index 012a36a6da..cf2f6fbacb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbBlurbname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetBlurb_Blurbname_sync] +// [START goldensample_generated_messagingclient_getblurb_blurbname_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -39,4 +39,4 @@ public class SyncGetBlurbBlurbname { } } } -// [END goldensample_generated_Messaging_GetBlurb_Blurbname_sync] +// [END goldensample_generated_messagingclient_getblurb_blurbname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden index ec7957a5d6..f82f4e7bc1 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetBlurbString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetBlurb_String_sync] +// [START goldensample_generated_messagingclient_getblurb_string_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.BlurbName; import com.google.showcase.v1beta1.MessagingClient; @@ -40,4 +40,4 @@ public class SyncGetBlurbString { } } } -// [END goldensample_generated_Messaging_GetBlurb_String_sync] +// [END goldensample_generated_messagingclient_getblurb_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden index 12aef664c1..78b7d13b61 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetRoom_sync] +// [START goldensample_generated_messagingclient_getroom_sync] import com.google.showcase.v1beta1.GetRoomRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -41,4 +41,4 @@ public class SyncGetRoom { } } } -// [END goldensample_generated_Messaging_GetRoom_sync] +// [END goldensample_generated_messagingclient_getroom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden index b732876cb2..56da552417 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetRoom_Roomname_sync] +// [START goldensample_generated_messagingclient_getroom_roomname_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncGetRoomRoomname { } } } -// [END goldensample_generated_Messaging_GetRoom_Roomname_sync] +// [END goldensample_generated_messagingclient_getroom_roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden index ce6113ed1a..f35f28cc90 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncGetRoomString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_GetRoom_String_sync] +// [START goldensample_generated_messagingclient_getroom_string_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.RoomName; @@ -39,4 +39,4 @@ public class SyncGetRoomString { } } } -// [END goldensample_generated_Messaging_GetRoom_String_sync] +// [END goldensample_generated_messagingclient_getroom_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden index af34fdbf29..cfc50e8565 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_sync] +// [START goldensample_generated_messagingclient_listblurbs_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.ListBlurbsRequest; import com.google.showcase.v1beta1.MessagingClient; @@ -47,4 +47,4 @@ public class SyncListBlurbs { } } } -// [END goldensample_generated_Messaging_ListBlurbs_sync] +// [END goldensample_generated_messagingclient_listblurbs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden index ce95287fb5..dfd515f13f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsProfilename.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_Profilename_sync] +// [START goldensample_generated_messagingclient_listblurbs_profilename_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -41,4 +41,4 @@ public class SyncListBlurbsProfilename { } } } -// [END goldensample_generated_Messaging_ListBlurbs_Profilename_sync] +// [END goldensample_generated_messagingclient_listblurbs_profilename_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden index f3bac1b2b5..0272c5ea93 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsRoomname.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_Roomname_sync] +// [START goldensample_generated_messagingclient_listblurbs_roomname_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.RoomName; @@ -41,4 +41,4 @@ public class SyncListBlurbsRoomname { } } } -// [END goldensample_generated_Messaging_ListBlurbs_Roomname_sync] +// [END goldensample_generated_messagingclient_listblurbs_roomname_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden index 89f24d8d1b..67d02e0c28 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListBlurbsString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListBlurbs_String_sync] +// [START goldensample_generated_messagingclient_listblurbs_string_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; @@ -41,4 +41,4 @@ public class SyncListBlurbsString { } } } -// [END goldensample_generated_Messaging_ListBlurbs_String_sync] +// [END goldensample_generated_messagingclient_listblurbs_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden index 0318e80856..780a3fd213 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncListRooms.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_ListRooms_sync] +// [START goldensample_generated_messagingclient_listrooms_sync] import com.google.showcase.v1beta1.ListRoomsRequest; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; @@ -45,4 +45,4 @@ public class SyncListRooms { } } } -// [END goldensample_generated_Messaging_ListRooms_sync] +// [END goldensample_generated_messagingclient_listrooms_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden index 09e3843acc..76bd8b75b6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbs.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_SearchBlurbs_sync] +// [START goldensample_generated_messagingclient_searchblurbs_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.ProfileName; import com.google.showcase.v1beta1.SearchBlurbsRequest; @@ -46,4 +46,4 @@ public class SyncSearchBlurbs { } } } -// [END goldensample_generated_Messaging_SearchBlurbs_sync] +// [END goldensample_generated_messagingclient_searchblurbs_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden index 2fbae35501..6ba0ae6e5a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncSearchBlurbsString.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_SearchBlurbs_String_sync] +// [START goldensample_generated_messagingclient_searchblurbs_string_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.SearchBlurbsResponse; @@ -38,4 +38,4 @@ public class SyncSearchBlurbsString { } } } -// [END goldensample_generated_Messaging_SearchBlurbs_String_sync] +// [END goldensample_generated_messagingclient_searchblurbs_string_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden index cc949cd2e2..eeaaa911d0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateBlurb.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_UpdateBlurb_sync] +// [START goldensample_generated_messagingclient_updateblurb_sync] import com.google.showcase.v1beta1.Blurb; import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.UpdateBlurbRequest; @@ -40,4 +40,4 @@ public class SyncUpdateBlurb { } } } -// [END goldensample_generated_Messaging_UpdateBlurb_sync] +// [END goldensample_generated_messagingclient_updateblurb_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden index f532f73957..7999de51dc 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/messagingclient/SyncUpdateRoom.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_Messaging_UpdateRoom_sync] +// [START goldensample_generated_messagingclient_updateroom_sync] import com.google.showcase.v1beta1.MessagingClient; import com.google.showcase.v1beta1.Room; import com.google.showcase.v1beta1.UpdateRoomRequest; @@ -40,4 +40,4 @@ public class SyncUpdateRoom { } } } -// [END goldensample_generated_Messaging_UpdateRoom_sync] +// [END goldensample_generated_messagingclient_updateroom_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden index 5d031b7c77..9cbdba2f24 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.samples; -// [START goldensample_generated_EchoSettings_Echo_sync] +// [START goldensample_generated_echosettings_echo_sync] import com.google.showcase.v1beta1.EchoSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncEcho { EchoSettings echoSettings = echoSettingsBuilder.build(); } } -// [END goldensample_generated_EchoSettings_Echo_sync] +// [END goldensample_generated_echosettings_echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden index 90cd534cee..325533a9b8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.samples; -// [START goldensample_generated_DeprecatedServiceSettings_FastFibonacci_sync] +// [START goldensample_generated_deprecatedservicesettings_fastfibonacci_sync] import com.google.testdata.v1.DeprecatedServiceSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public class SyncFastFibonacci { DeprecatedServiceSettings deprecatedServiceSettings = deprecatedServiceSettingsBuilder.build(); } } -// [END goldensample_generated_DeprecatedServiceSettings_FastFibonacci_sync] +// [END goldensample_generated_deprecatedservicesettings_fastfibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden index 7417d5b42e..0d33be22fe 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncCreateTopic.golden @@ -16,7 +16,7 @@ package com.google.pubsub.v1.stub.samples; -// [START goldensample_generated_PublisherStubSettings_CreateTopic_sync] +// [START goldensample_generated_publisherstubsettings_createtopic_sync] import com.google.pubsub.v1.stub.PublisherStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncCreateTopic { PublisherStubSettings publisherSettings = publisherSettingsBuilder.build(); } } -// [END goldensample_generated_PublisherStubSettings_CreateTopic_sync] +// [END goldensample_generated_publisherstubsettings_createtopic_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden index a72b00ae23..bc1c42a9fd 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncDeleteLog.golden @@ -16,7 +16,7 @@ package com.google.logging.v2.stub.samples; -// [START goldensample_generated_LoggingServiceV2StubSettings_DeleteLog_sync] +// [START goldensample_generated_loggingservicev2stubsettings_deletelog_sync] import com.google.logging.v2.stub.LoggingServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public class SyncDeleteLog { LoggingServiceV2StubSettings loggingServiceV2Settings = loggingServiceV2SettingsBuilder.build(); } } -// [END goldensample_generated_LoggingServiceV2StubSettings_DeleteLog_sync] +// [END goldensample_generated_loggingservicev2stubsettings_deletelog_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden index 968fb98297..7a97d3f41b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncEcho.golden @@ -16,7 +16,7 @@ package com.google.showcase.v1beta1.stub.samples; -// [START goldensample_generated_EchoStubSettings_Echo_sync] +// [START goldensample_generated_echostubsettings_echo_sync] import com.google.showcase.v1beta1.stub.EchoStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public class SyncEcho { EchoStubSettings echoSettings = echoSettingsBuilder.build(); } } -// [END goldensample_generated_EchoStubSettings_Echo_sync] +// [END goldensample_generated_echostubsettings_echo_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden index 042d351178..47814df155 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/samples/servicesettings/stub/SyncFastFibonacci.golden @@ -16,7 +16,7 @@ package com.google.testdata.v1.stub.samples; -// [START goldensample_generated_DeprecatedServiceStubSettings_FastFibonacci_sync] +// [START goldensample_generated_deprecatedservicestubsettings_fastfibonacci_sync] import com.google.testdata.v1.stub.DeprecatedServiceStubSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public class SyncFastFibonacci { deprecatedServiceSettingsBuilder.build(); } } -// [END goldensample_generated_DeprecatedServiceStubSettings_FastFibonacci_sync] +// [END goldensample_generated_deprecatedservicestubsettings_fastfibonacci_sync] diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden index 15d3a77a29..5e38c6d146 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden @@ -105,7 +105,11 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoSettings echoSettings = EchoSettings.newHttpJsonBuilder().build(); + * EchoSettings echoSettings = + * EchoSettings.newBuilder() + * .setTransportChannelProvider( + * EchoSettings.defaultHttpJsonTransportProviderBuilder().build()) + * .build(); * EchoClient echoClient = EchoClient.create(echoSettings); * } * diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden index d9708af4ae..0165872e80 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden @@ -85,7 +85,11 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoEmpySettings echoEmpySettings = EchoEmpySettings.newHttpJsonBuilder().build(); + * EchoEmpySettings echoEmpySettings = + * EchoEmpySettings.newBuilder() + * .setTransportChannelProvider( + * EchoEmpySettings.defaultHttpJsonTransportProviderBuilder().build()) + * .build(); * EchoEmpyClient echoEmpyClient = EchoEmpyClient.create(echoEmpySettings); * } * diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java index 243ef54ce2..e8eccd9eec 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposerTest.java @@ -14,35 +14,23 @@ package com.google.api.generator.gapic.composer.rest; -import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.writer.JavaWriterVisitor; -import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; -import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; 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 com.google.common.truth.Truth; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.Before; import org.junit.Test; public class HttpJsonServiceStubClassComposerTest { - - private HttpJsonServiceStubClassComposer composer; - - @Before - public void setUp() throws Exception { - composer = HttpJsonServiceStubClassComposer.instance(); - } - @Test public void generateServiceClasses() { GapicContext context = RestTestProtoLoader.instance().parseCompliance(); Service echoProtoService = context.services().get(0); - GapicClass clazz = composer.generate(context, echoProtoService); + GapicClass clazz = + HttpJsonServiceStubClassComposer.instance().generate(context, echoProtoService); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -51,49 +39,4 @@ public void generateServiceClasses() { Paths.get(Utils.getGoldenDir(this.getClass()), "HttpJsonComplianceStub.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); } - - @Test - public void - getBindingFieldMethodName_shouldReturnGetFieldListIfTheFieldIsInLastPositionAndIsRepeated() { - Field field = - Field.builder() - .setIsRepeated(true) - .setName("doesNotMatter") - .setType(TypeNode.OBJECT) - .build(); - HttpBinding httpBinding = - HttpBinding.builder().setField(field).setName("doesNotMatter").build(); - String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Values"); - Truth.assertThat(actual).isEqualTo("getValuesList"); - } - - @Test - public void - getBindingFieldMethodName_shouldReturnGetFieldValueIfTheFieldIsInLastPositionAndIsEnum() { - Field field = - Field.builder().setIsEnum(true).setName("doesNotMatter").setType(TypeNode.OBJECT).build(); - HttpBinding httpBinding = - HttpBinding.builder().setField(field).setName("doesNotMatter").build(); - String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Enums"); - Truth.assertThat(actual).isEqualTo("getEnumsValue"); - } - - @Test - public void - getBindingFieldMethodName_shouldReturnGetFieldIfTheFieldIsInLastPositionAndNotRepeatedOrEnum() { - Field field = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT).build(); - HttpBinding httpBinding = - HttpBinding.builder().setField(field).setName("doesNotMatter").build(); - String actual = composer.getBindingFieldMethodName(httpBinding, 4, 3, "Value"); - Truth.assertThat(actual).isEqualTo("getValue"); - } - - @Test - public void getBindingFieldMethodName_shouldReturnGetFieldIfTheFieldIsNotInLastPosition() { - Field field = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT).build(); - HttpBinding httpBinding = - HttpBinding.builder().setField(field).setName("doesNotMatter").build(); - String actual = composer.getBindingFieldMethodName(httpBinding, 4, 1, "Value"); - Truth.assertThat(actual).isEqualTo("getValue"); - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden index 07e6b442e2..9f72651e9c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceClientTest.golden @@ -560,102 +560,4 @@ public class ComplianceClientTest { // Expected exception. } } - - @Test - public void getEnumTest() throws Exception { - EnumResponse expectedResponse = - EnumResponse.newBuilder() - .setRequest(EnumRequest.newBuilder().build()) - .setContinent(Continent.forNumber(0)) - .build(); - mockService.addResponse(expectedResponse); - - EnumRequest request = EnumRequest.newBuilder().setUnknownEnum(true).build(); - - EnumResponse actualResponse = client.getEnum(request); - Assert.assertEquals(expectedResponse, actualResponse); - - List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); - - String apiClientHeaderKey = - mockService - .getRequestHeaders() - .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) - .iterator() - .next(); - Assert.assertTrue( - GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() - .matcher(apiClientHeaderKey) - .matches()); - } - - @Test - public void getEnumExceptionTest() throws Exception { - ApiException exception = - ApiExceptionFactory.createException( - new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); - mockService.addException(exception); - - try { - EnumRequest request = EnumRequest.newBuilder().setUnknownEnum(true).build(); - client.getEnum(request); - Assert.fail("No exception raised"); - } catch (InvalidArgumentException e) { - // Expected exception. - } - } - - @Test - public void verifyEnumTest() throws Exception { - EnumResponse expectedResponse = - EnumResponse.newBuilder() - .setRequest(EnumRequest.newBuilder().build()) - .setContinent(Continent.forNumber(0)) - .build(); - mockService.addResponse(expectedResponse); - - EnumResponse request = - EnumResponse.newBuilder() - .setRequest(EnumRequest.newBuilder().build()) - .setContinent(Continent.forNumber(0)) - .build(); - - EnumResponse actualResponse = client.verifyEnum(request); - Assert.assertEquals(expectedResponse, actualResponse); - - List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); - - String apiClientHeaderKey = - mockService - .getRequestHeaders() - .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) - .iterator() - .next(); - Assert.assertTrue( - GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() - .matcher(apiClientHeaderKey) - .matches()); - } - - @Test - public void verifyEnumExceptionTest() throws Exception { - ApiException exception = - ApiExceptionFactory.createException( - new Exception(), FakeStatusCode.of(StatusCode.Code.INVALID_ARGUMENT), false); - mockService.addException(exception); - - try { - EnumResponse request = - EnumResponse.newBuilder() - .setRequest(EnumRequest.newBuilder().build()) - .setContinent(Continent.forNumber(0)) - .build(); - client.verifyEnum(request); - Assert.fail("No exception raised"); - } catch (InvalidArgumentException e) { - // Expected exception. - } - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden index 3730206623..afa6402beb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceSettings.golden @@ -86,16 +86,6 @@ public class ComplianceSettings extends ClientSettings { return ((ComplianceStubSettings) getStubSettings()).repeatDataPathTrailingResourceSettings(); } - /** Returns the object with the settings used for calls to getEnum. */ - public UnaryCallSettings getEnumSettings() { - return ((ComplianceStubSettings) getStubSettings()).getEnumSettings(); - } - - /** Returns the object with the settings used for calls to verifyEnum. */ - public UnaryCallSettings verifyEnumSettings() { - return ((ComplianceStubSettings) getStubSettings()).verifyEnumSettings(); - } - public static final ComplianceSettings create(ComplianceStubSettings stub) throws IOException { return new ComplianceSettings.Builder(stub.toBuilder()).build(); } @@ -225,16 +215,6 @@ public class ComplianceSettings extends ClientSettings { return getStubSettingsBuilder().repeatDataPathTrailingResourceSettings(); } - /** Returns the builder for the settings used for calls to getEnum. */ - public UnaryCallSettings.Builder getEnumSettings() { - return getStubSettingsBuilder().getEnumSettings(); - } - - /** Returns the builder for the settings used for calls to verifyEnum. */ - public UnaryCallSettings.Builder verifyEnumSettings() { - return getStubSettingsBuilder().verifyEnumSettings(); - } - @Override public ComplianceSettings build() throws IOException { return new ComplianceSettings(this); diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden index acd321473f..f124efd10d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden @@ -19,8 +19,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.showcase.v1beta1.EnumRequest; -import com.google.showcase.v1beta1.EnumResponse; import com.google.showcase.v1beta1.RepeatRequest; import com.google.showcase.v1beta1.RepeatResponse; import java.io.IOException; @@ -77,8 +75,6 @@ public class ComplianceStubSettings extends StubSettings private final UnaryCallSettings repeatDataPathResourceSettings; private final UnaryCallSettings repeatDataPathTrailingResourceSettings; - private final UnaryCallSettings getEnumSettings; - private final UnaryCallSettings verifyEnumSettings; /** Returns the object with the settings used for calls to repeatDataBody. */ public UnaryCallSettings repeatDataBodySettings() { @@ -110,16 +106,6 @@ public class ComplianceStubSettings extends StubSettings return repeatDataPathTrailingResourceSettings; } - /** Returns the object with the settings used for calls to getEnum. */ - public UnaryCallSettings getEnumSettings() { - return getEnumSettings; - } - - /** Returns the object with the settings used for calls to verifyEnum. */ - public UnaryCallSettings verifyEnumSettings() { - return verifyEnumSettings; - } - public ComplianceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() @@ -203,8 +189,6 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings = settingsBuilder.repeatDataPathResourceSettings().build(); repeatDataPathTrailingResourceSettings = settingsBuilder.repeatDataPathTrailingResourceSettings().build(); - getEnumSettings = settingsBuilder.getEnumSettings().build(); - verifyEnumSettings = settingsBuilder.verifyEnumSettings().build(); } /** Builder for ComplianceStubSettings. */ @@ -220,8 +204,6 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings; private final UnaryCallSettings.Builder repeatDataPathTrailingResourceSettings; - private final UnaryCallSettings.Builder getEnumSettings; - private final UnaryCallSettings.Builder verifyEnumSettings; private static final ImmutableMap> RETRYABLE_CODE_DEFINITIONS; @@ -255,8 +237,6 @@ public class ComplianceStubSettings extends StubSettings repeatDataSimplePathSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); repeatDataPathResourceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); repeatDataPathTrailingResourceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); - getEnumSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); - verifyEnumSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); unaryMethodSettingsBuilders = ImmutableList.>of( @@ -265,9 +245,7 @@ public class ComplianceStubSettings extends StubSettings repeatDataQuerySettings, repeatDataSimplePathSettings, repeatDataPathResourceSettings, - repeatDataPathTrailingResourceSettings, - getEnumSettings, - verifyEnumSettings); + repeatDataPathTrailingResourceSettings); initDefaults(this); } @@ -281,8 +259,6 @@ public class ComplianceStubSettings extends StubSettings repeatDataPathResourceSettings = settings.repeatDataPathResourceSettings.toBuilder(); repeatDataPathTrailingResourceSettings = settings.repeatDataPathTrailingResourceSettings.toBuilder(); - getEnumSettings = settings.getEnumSettings.toBuilder(); - verifyEnumSettings = settings.verifyEnumSettings.toBuilder(); unaryMethodSettingsBuilders = ImmutableList.>of( @@ -291,9 +267,7 @@ public class ComplianceStubSettings extends StubSettings repeatDataQuerySettings, repeatDataSimplePathSettings, repeatDataPathResourceSettings, - repeatDataPathTrailingResourceSettings, - getEnumSettings, - verifyEnumSettings); + repeatDataPathTrailingResourceSettings); } private static Builder createDefault() { @@ -340,16 +314,6 @@ public class ComplianceStubSettings extends StubSettings .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); - builder - .getEnumSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); - - builder - .verifyEnumSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params")); - return builder; } @@ -400,16 +364,6 @@ public class ComplianceStubSettings extends StubSettings return repeatDataPathTrailingResourceSettings; } - /** Returns the builder for the settings used for calls to getEnum. */ - public UnaryCallSettings.Builder getEnumSettings() { - return getEnumSettings; - } - - /** Returns the builder for the settings used for calls to verifyEnum. */ - public UnaryCallSettings.Builder verifyEnumSettings() { - return verifyEnumSettings; - } - @Override public ComplianceStubSettings build() throws IOException { return new ComplianceStubSettings(this); diff --git a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden index bf282ba988..f2836caf50 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden @@ -13,8 +13,6 @@ import com.google.api.gax.httpjson.ProtoRestSerializer; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; import com.google.protobuf.TypeRegistry; -import com.google.showcase.v1beta1.EnumRequest; -import com.google.showcase.v1beta1.EnumResponse; import com.google.showcase.v1beta1.RepeatRequest; import com.google.showcase.v1beta1.RepeatResponse; import java.io.IOException; @@ -170,7 +168,7 @@ public class HttpJsonComplianceStub extends ComplianceStub { serializer.putPathParam( fields, "info.fInt32", request.getInfo().getFInt32()); serializer.putPathParam( - fields, "info.fKingdom", request.getInfo().getFKingdomValue()); + fields, "info.fKingdom", request.getInfo().getFKingdom()); serializer.putPathParam( fields, "info.fString", request.getInfo().getFString()); return fields; @@ -287,77 +285,12 @@ public class HttpJsonComplianceStub extends ComplianceStub { .build()) .build(); - private static final ApiMethodDescriptor getEnumMethodDescriptor = - ApiMethodDescriptor.newBuilder() - .setFullMethodName("google.showcase.v1beta1.Compliance/GetEnum") - .setHttpMethod("GET") - .setType(ApiMethodDescriptor.MethodType.UNARY) - .setRequestFormatter( - ProtoMessageRequestFormatter.newBuilder() - .setPath( - "/v1beta1/compliance/enum", - request -> { - Map fields = new HashMap<>(); - ProtoRestSerializer serializer = ProtoRestSerializer.create(); - return fields; - }) - .setQueryParamsExtractor( - request -> { - Map> fields = new HashMap<>(); - ProtoRestSerializer serializer = ProtoRestSerializer.create(); - serializer.putQueryParam(fields, "unknownEnum", request.getUnknownEnum()); - serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); - return fields; - }) - .setRequestBodyExtractor(request -> null) - .build()) - .setResponseParser( - ProtoMessageResponseParser.newBuilder() - .setDefaultInstance(EnumResponse.getDefaultInstance()) - .setDefaultTypeRegistry(typeRegistry) - .build()) - .build(); - - private static final ApiMethodDescriptor verifyEnumMethodDescriptor = - ApiMethodDescriptor.newBuilder() - .setFullMethodName("google.showcase.v1beta1.Compliance/VerifyEnum") - .setHttpMethod("POST") - .setType(ApiMethodDescriptor.MethodType.UNARY) - .setRequestFormatter( - ProtoMessageRequestFormatter.newBuilder() - .setPath( - "/v1beta1/compliance/enum", - request -> { - Map fields = new HashMap<>(); - ProtoRestSerializer serializer = ProtoRestSerializer.create(); - return fields; - }) - .setQueryParamsExtractor( - request -> { - Map> fields = new HashMap<>(); - ProtoRestSerializer serializer = ProtoRestSerializer.create(); - serializer.putQueryParam(fields, "continent", request.getContinentValue()); - serializer.putQueryParam(fields, "request", request.getRequest()); - serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int"); - return fields; - }) - .setRequestBodyExtractor(request -> null) - .build()) - .setResponseParser( - ProtoMessageResponseParser.newBuilder() - .setDefaultInstance(EnumResponse.getDefaultInstance()) - .setDefaultTypeRegistry(typeRegistry) - .build()) - .build(); - private final UnaryCallable repeatDataBodyCallable; private final UnaryCallable repeatDataBodyInfoCallable; private final UnaryCallable repeatDataQueryCallable; private final UnaryCallable repeatDataSimplePathCallable; private final UnaryCallable repeatDataPathResourceCallable; private final UnaryCallable repeatDataPathTrailingResourceCallable; - private final UnaryCallable getEnumCallable; - private final UnaryCallable verifyEnumCallable; private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; @@ -431,16 +364,6 @@ public class HttpJsonComplianceStub extends ComplianceStub { .setMethodDescriptor(repeatDataPathTrailingResourceMethodDescriptor) .setTypeRegistry(typeRegistry) .build(); - HttpJsonCallSettings getEnumTransportSettings = - HttpJsonCallSettings.newBuilder() - .setMethodDescriptor(getEnumMethodDescriptor) - .setTypeRegistry(typeRegistry) - .build(); - HttpJsonCallSettings verifyEnumTransportSettings = - HttpJsonCallSettings.newBuilder() - .setMethodDescriptor(verifyEnumMethodDescriptor) - .setTypeRegistry(typeRegistry) - .build(); this.repeatDataBodyCallable = callableFactory.createUnaryCallable( @@ -468,12 +391,6 @@ public class HttpJsonComplianceStub extends ComplianceStub { repeatDataPathTrailingResourceTransportSettings, settings.repeatDataPathTrailingResourceSettings(), clientContext); - this.getEnumCallable = - callableFactory.createUnaryCallable( - getEnumTransportSettings, settings.getEnumSettings(), clientContext); - this.verifyEnumCallable = - callableFactory.createUnaryCallable( - verifyEnumTransportSettings, settings.verifyEnumSettings(), clientContext); this.backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources()); @@ -488,8 +405,6 @@ public class HttpJsonComplianceStub extends ComplianceStub { methodDescriptors.add(repeatDataSimplePathMethodDescriptor); methodDescriptors.add(repeatDataPathResourceMethodDescriptor); methodDescriptors.add(repeatDataPathTrailingResourceMethodDescriptor); - methodDescriptors.add(getEnumMethodDescriptor); - methodDescriptors.add(verifyEnumMethodDescriptor); return methodDescriptors; } @@ -523,16 +438,6 @@ public class HttpJsonComplianceStub extends ComplianceStub { return repeatDataPathTrailingResourceCallable; } - @Override - public UnaryCallable getEnumCallable() { - return getEnumCallable; - } - - @Override - public UnaryCallable verifyEnumCallable() { - return verifyEnumCallable; - } - @Override public final void close() { try { diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java index d34c2d6714..679b7684a8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriterTest.java @@ -132,7 +132,7 @@ public void writeExecutableSample() { "\n", "package com.google.samples;\n", "\n", - "// [START testing_v1_generated_Samples_Write_ExecutableSample_sync]\n", + "// [START testing_v1_generated_samples_write_executablesample_sync]\n", "import com.google.api.gax.rpc.ClientSettings;\n", "\n", "public class SyncWriteExecutableSample {\n", @@ -153,7 +153,7 @@ public void writeExecutableSample() { " }\n", " }\n", "}\n", - "// [END testing_v1_generated_Samples_Write_ExecutableSample_sync]\n"); + "// [END testing_v1_generated_samples_write_executablesample_sync]\n"); Assert.assertEquals(expected, result); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java index 726166861d..99aea60849 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerTest.java @@ -75,7 +75,7 @@ public void createExecutableSampleEmptyStatementSample() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_Echo_CreateExecutableSample_EmptyStatementSample_sync]\n", + "// [START apiname_generated_echo_createexecutablesample_emptystatementsample_sync]\n", "public class SyncCreateExecutableSampleEmptyStatementSample {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -90,7 +90,7 @@ public void createExecutableSampleEmptyStatementSample() { " // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library\n", " }\n", "}\n", - "// [END apiname_generated_Echo_CreateExecutableSample_EmptyStatementSample_sync]\n"); + "// [END apiname_generated_echo_createexecutablesample_emptystatementsample_sync]\n"); assertEquals(expected, sampleResult); } @@ -114,7 +114,7 @@ public void createExecutableSampleMethodArgsNoVar() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_Echo_CreateExecutableSample_MethodArgsNoVar_sync]\n", + "// [START apiname_generated_echo_createexecutablesample_methodargsnovar_sync]\n", "public class SyncCreateExecutableSampleMethodArgsNoVar {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -130,7 +130,7 @@ public void createExecutableSampleMethodArgsNoVar() { " System.out.println(\"Testing CreateExecutableSampleMethodArgsNoVar\");\n", " }\n", "}\n", - "// [END apiname_generated_Echo_CreateExecutableSample_MethodArgsNoVar_sync]\n"); + "// [END apiname_generated_echo_createexecutablesample_methodargsnovar_sync]\n"); assertEquals(expected, sampleResult); } @@ -162,7 +162,7 @@ public void createExecutableSampleMethod() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_Echo_CreateExecutableSample_sync]\n", + "// [START apiname_generated_echo_createexecutablesample_sync]\n", "public class SyncCreateExecutableSample {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -179,7 +179,7 @@ public void createExecutableSampleMethod() { " System.out.println(content);\n", " }\n", "}\n", - "// [END apiname_generated_Echo_CreateExecutableSample_sync]\n"); + "// [END apiname_generated_echo_createexecutablesample_sync]\n"); assertEquals(expected, sampleResult); } @@ -248,7 +248,7 @@ public void createExecutableSampleMethodMultipleStatements() { LineFormatter.lines( "package com.google.example;\n", "\n", - "// [START apiname_generated_Echo_CreateExecutableSample_MethodMultipleStatements_sync]\n", + "// [START apiname_generated_echo_createexecutablesample_methodmultiplestatements_sync]\n", "public class SyncCreateExecutableSampleMethodMultipleStatements {\n", "\n", " public static void main(String[] args) throws Exception {\n", @@ -270,7 +270,7 @@ public void createExecutableSampleMethodMultipleStatements() { " System.out.println(thing.response());\n", " }\n", "}\n", - "// [END apiname_generated_Echo_CreateExecutableSample_MethodMultipleStatements_sync]\n"); + "// [END apiname_generated_echo_createexecutablesample_methodmultiplestatements_sync]\n"); assertEquals(expected, sampleResult); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java index 3edd5936de..2199c2f49d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java @@ -22,7 +22,6 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; -import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors; @@ -38,16 +37,6 @@ public class ServiceClientCallableMethodSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; - private static final Service BasicService = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .build(); /*Testing composeLroCallableMethod*/ @Test @@ -94,21 +83,10 @@ public void valid_composeLroCallableMethod_withReturnResponse() { .setOutputType(outputType) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -162,21 +140,10 @@ public void valid_composeLroCallableMethod_withReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -220,21 +187,10 @@ public void valid_composePagedCallableMethod() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -284,22 +240,11 @@ public void invalid_composePagedCallableMethod_inputTypeNotExistInMessage() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -332,22 +277,11 @@ public void invalid_composePagedCallableMethod_noExistMethodResponse() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -394,22 +328,11 @@ public void invalid_composePagedCallableMethod_noRepeatedResponse() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } /*Testing composeStreamCallableMethod*/ @@ -443,21 +366,10 @@ public void valid_composeStreamCallableMethod_serverStream() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -501,22 +413,11 @@ public void invalid_composeStreamCallableMethod_serverStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -549,21 +450,10 @@ public void valid_composeStreamCallableMethod_bidiStream() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -616,22 +506,11 @@ public void invalid_composeStreamCallableMethod_bidiStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -664,21 +543,10 @@ public void valid_composeStreamCallableMethod_clientStream() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -745,22 +613,11 @@ public void invalid_composeStreamCallableMethod_clientStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } /*Testing composeRegularCallableMethod*/ @@ -789,21 +646,10 @@ public void valid_composeRegularCallableMethod_unaryRpc() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -867,21 +713,10 @@ public void valid_composeRegularCallableMethod_lroRpc() { .setOutputType(outputType) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -934,21 +769,10 @@ public void valid_composeRegularCallableMethod_lroRpcWithReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -991,21 +815,10 @@ public void valid_composeRegularCallableMethod_pageRpc() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -1056,22 +869,11 @@ public void invalid_composeRegularCallableMethod_noExistMethodRequest() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -1104,22 +906,11 @@ public void invalid_composeRegularCallableMethod_noExistMethodResponsePagedRpc() .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -1166,22 +957,11 @@ public void invalid_composeRegularCallableMethod_noRepeatedResponsePagedRpc() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } private String writeStatements(Sample sample) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java index 64593d0fea..32ab486356 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java @@ -45,16 +45,6 @@ public class ServiceClientHeaderSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; - private static final Service TEST_SERVICE = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .build(); /*Testing composeClassHeaderSample*/ @Test @@ -307,7 +297,7 @@ public void composeSetCredentialsSample() { String results = writeStatements( ServiceClientHeaderSampleComposer.composeSetCredentialsSample( - clientType, settingsType, TEST_SERVICE)); + clientType, settingsType)); String expected = LineFormatter.lines( "EchoSettings echoSettings =\n", @@ -335,8 +325,7 @@ public void composeSetEndpointSample() { .build()); String results = writeStatements( - ServiceClientHeaderSampleComposer.composeSetEndpointSample( - clientType, settingsType, TEST_SERVICE)); + ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType)); String expected = LineFormatter.lines( "EchoSettings echoSettings =" @@ -351,7 +340,6 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument Descriptors.FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor(); Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); Map messageTypes = Parser.parseMessages(echoFileDescriptor); - TypeNode clientType = TypeNode.withReference( VaporReference.builder() @@ -425,22 +413,11 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes, service)); + method, clientType, arguments, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -510,22 +487,11 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithNoMethodArguments() { .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes, service)); + method, clientType, arguments, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -568,22 +534,11 @@ public void invalid_composeShowcaseMethodSample_noMatchedRepeatedResponseTypeInP .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes, service)); + method, clientType, methodArguments, resourceNames, messageTypes)); } @Test @@ -640,22 +595,11 @@ public void invalid_composeShowcaseMethodSample_noRepeatedResponseTypeInPagedMet .setFields(Arrays.asList(responseField, nextPageToken)) .build(); messageTypes.put("PagedResponse", noRepeatedFieldMessage); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes, service)); + method, clientType, methodArguments, resourceNames, messageTypes)); } @Test @@ -703,21 +647,11 @@ public void valid_composeShowcaseMethodSample_lroUnaryRpcWithNoMethodArgument() .setLro(lro) .setMethodSignatures(Collections.emptyList()) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); + String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, Collections.emptyList(), resourceNames, messageTypes, service)); + method, clientType, Collections.emptyList(), resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -788,21 +722,10 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnResponseType() { .setMethodSignatures(Arrays.asList(arguments)) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes, service)); + method, clientType, arguments, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -870,21 +793,11 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnVoid() { .setLro(lro) .setMethodSignatures(Arrays.asList(arguments)) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo") - .setMethods(Arrays.asList(method)) - .build(); + String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes, service)); + method, clientType, arguments, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java index 68b76374a9..bd6366b11f 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java @@ -21,12 +21,10 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; -import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; -import java.util.Arrays; import java.util.Collections; import java.util.Map; import org.junit.Assert; @@ -69,21 +67,10 @@ public void valid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -131,22 +118,11 @@ public void invalid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); } @Test @@ -191,21 +167,10 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnResponse() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -260,21 +225,10 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnVoid() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -311,21 +265,10 @@ public void valid_composeDefaultSample_pureUnaryReturnVoid() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -373,21 +316,10 @@ public void valid_composeDefaultSample_pureUnaryReturnResponse() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); - Service service = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setMethods(Arrays.asList(method)) - .setOverriddenName("Echo") - .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes, service)); + method, clientType, resourceNames, messageTypes)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java b/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java deleted file mode 100644 index f8713e0564..0000000000 --- a/src/test/java/com/google/api/generator/gapic/model/HttpBindingsTest.java +++ /dev/null @@ -1,99 +0,0 @@ -// 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.model; - -import com.google.api.generator.engine.ast.TypeNode; -import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; -import com.google.common.truth.Truth; -import org.junit.Before; -import org.junit.Test; - -public class HttpBindingsTest { - - public Field.Builder fieldBuilder; - public HttpBinding.Builder httpBindingBuilder; - - @Before - public void setUp() throws Exception { - fieldBuilder = Field.builder().setName("doesNotMatter").setType(TypeNode.OBJECT); - httpBindingBuilder = HttpBinding.builder().setName("doesNotMatter"); - } - - @Test - public void isOptional_shouldReturnFalseIfFieldIsNull() { - HttpBinding httpBinding = httpBindingBuilder.build(); - Truth.assertThat(httpBinding.isOptional()).isFalse(); - } - - @Test - public void isOptional_shouldReturnFalseIfFieldExistsAndIsOptionalIsFalse() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsProto3Optional(false).build()).build(); - - Truth.assertThat(httpBinding.isOptional()).isFalse(); - } - - @Test - public void isOptional_shouldReturnTrueIfFieldExistsAndIsOptionalIsTue() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsProto3Optional(true).build()).build(); - - Truth.assertThat(httpBinding.isOptional()).isTrue(); - } - - @Test - public void isRepeated_shouldReturnFalseIfFieldIsNull() { - HttpBinding httpBinding = httpBindingBuilder.build(); - Truth.assertThat(httpBinding.isRepeated()).isFalse(); - } - - @Test - public void isRepeated_shouldReturnFalseIfFieldExistsAndIsRepeatedIsFalse() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsRepeated(false).build()).build(); - - Truth.assertThat(httpBinding.isRepeated()).isFalse(); - } - - @Test - public void isRepeated_shouldReturnTrueIfFieldExistsAndIsRepeatedIsTue() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsRepeated(true).build()).build(); - - Truth.assertThat(httpBinding.isRepeated()).isTrue(); - } - - @Test - public void isEnum_shouldReturnFalseIfFieldIsNull() { - HttpBinding httpBinding = httpBindingBuilder.build(); - Truth.assertThat(httpBinding.isEnum()).isFalse(); - } - - @Test - public void isEnum_shouldReturnFalseIfFieldExistsAndIsEnumIsFalse() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsEnum(false).build()).build(); - - Truth.assertThat(httpBinding.isEnum()).isFalse(); - } - - @Test - public void isEnum_shouldReturnTrueIfFieldExistsAndIsEnumIsTue() { - HttpBinding httpBinding = - httpBindingBuilder.setField(fieldBuilder.setIsEnum(true).build()).build(); - - Truth.assertThat(httpBinding.isEnum()).isTrue(); - } -} diff --git a/src/test/java/com/google/api/generator/gapic/model/MethodTest.java b/src/test/java/com/google/api/generator/gapic/model/MethodTest.java index cecee806f9..93fe4b8135 100644 --- a/src/test/java/com/google/api/generator/gapic/model/MethodTest.java +++ b/src/test/java/com/google/api/generator/gapic/model/MethodTest.java @@ -34,7 +34,7 @@ public class MethodTest { .build(); private static final HttpBindings HTTP_BINDINGS = HttpBindings.builder() - .setPathParameters(ImmutableSet.of(HttpBinding.builder().setName("table").build())) + .setPathParameters(ImmutableSet.of(HttpBinding.create("table", true, false, ""))) .setPattern("/pattern/test") .setAdditionalPatterns(Arrays.asList("/extra_pattern/test", "/extra_pattern/hey")) .setIsAsteriskBody(false) diff --git a/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java b/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java index e3a96fbd21..a45d206de9 100644 --- a/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java +++ b/src/test/java/com/google/api/generator/gapic/model/RegionTagTest.java @@ -104,7 +104,7 @@ public void generateRegionTagsValidMissingFields() { .build(); String result = regionTag.generate(); - String expected = "shortname_generated_ServiceName_RpcName_sync"; + String expected = "shortname_generated_servicename_rpcname_sync"; Assert.assertEquals(expected, result); } @@ -121,7 +121,7 @@ public void generateRegionTagsAllFields() { .build(); String result = regionTag.generate(); - String expected = "shortname_v1_generated_ServiceName_RpcName_Disambiguation_async"; + String expected = "shortname_v1_generated_servicename_rpcname_disambiguation_async"; Assert.assertEquals(expected, result); } @@ -143,8 +143,8 @@ public void generateRegionTagTag() { regionTag.generateTag(RegionTag.RegionTagRegion.END, regionTag.generate()))); String expected = LineFormatter.lines( - "// [START shortname_v1_generated_ServiceName_RpcName_Disambiguation_sync]\n", - "// [END shortname_v1_generated_ServiceName_RpcName_Disambiguation_sync]"); + "// [START shortname_v1_generated_servicename_rpcname_disambiguation_sync]\n", + "// [END shortname_v1_generated_servicename_rpcname_disambiguation_sync]"); Assert.assertEquals(expected, result); } } diff --git a/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java b/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java deleted file mode 100644 index c6f60b831f..0000000000 --- a/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java +++ /dev/null @@ -1,75 +0,0 @@ -// 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.model; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import org.junit.Test; - -public class ServiceTest { - private static final String SHOWCASE_PACKAGE_NAME = "com.google.showcase.v1beta1"; - private static final Service.Builder testServiceBuilder = - Service.builder() - .setName("Echo") - .setDefaultHost("localhost:7469") - .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) - .setPakkage(SHOWCASE_PACKAGE_NAME) - .setProtoPakkage(SHOWCASE_PACKAGE_NAME) - .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) - .setOverriddenName("Echo"); - - @Test - public void apiShortName_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { - String defaultHost = "us-east1-pubsub.googleapis.com"; - Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); - assertEquals("pubsub", testService.apiShortName()); - } - - @Test - public void apiShortName_shouldReturnApiShortName() { - String defaultHost = "logging.googleapis.com"; - Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); - assertEquals("logging", testService.apiShortName()); - } - - @Test - public void apiShortName_shouldReturnApiShortNameForIam() { - String defaultHost = "iam-meta-api.googleapis.com"; - Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); - assertEquals("iam", testService.apiShortName()); - } - - @Test - public void apiShortName_shouldReturnHostIfNoPeriods() { - String defaultHost = "logging:7469"; - Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); - assertEquals("logging:7469", testService.apiShortName()); - } - - @Test - public void apiVersion_shouldReturnVersionIfMatch() { - String protoPackage = "com.google.showcase.v1"; - Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); - assertEquals("v1", testService.apiVersion()); - } - - @Test - public void apiVersion_shouldReturnEmptyIfNoMatch() { - String protoPackage = "com.google.showcase"; - Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); - assertEquals("", testService.apiVersion()); - } -} diff --git a/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java b/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java index 5269e1d982..31fc531555 100644 --- a/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java +++ b/src/test/java/com/google/api/generator/gapic/protoparser/HttpRuleParserTest.java @@ -22,16 +22,12 @@ import com.google.api.generator.gapic.model.HttpBindings; import com.google.api.generator.gapic.model.HttpBindings.HttpBinding; import com.google.api.generator.gapic.model.Message; -import com.google.common.truth.Truth; -import com.google.http.rule.parser.HttpRuleParserTestingOuterClass; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.TestingOuterClass; -import java.util.HashSet; import java.util.Map; import java.util.stream.Collectors; -import org.junit.Ignore; import org.junit.Test; public class HttpRuleParserTest { @@ -95,83 +91,4 @@ public void parseHttpAnnotation_missingFieldFromMessage() { assertThrows( IllegalStateException.class, () -> HttpRuleParser.parse(rpcMethod, inputMessage, messages)); } - - @Test - public void - parseHttpAnnotation_shouldPutAllFieldsIntoQueryParamsIfPathParamAndBodyAreNotConfigured() { - FileDescriptor fileDescriptor = HttpRuleParserTestingOuterClass.getDescriptor(); - ServiceDescriptor serviceDescriptor = fileDescriptor.getServices().get(0); - assertEquals("HttpRuleParserTesting", serviceDescriptor.getName()); - - Map messages = Parser.parseMessages(fileDescriptor); - - MethodDescriptor rpcMethod = - serviceDescriptor.getMethods().stream() - .filter( - methodDescriptor -> methodDescriptor.getName().equals("QueryParamHappyPathTest")) - .findAny() - .get(); - Message inputMessage = messages.get("com.google.http.rule.parser.QueryParamRequest"); - HttpBindings actual = HttpRuleParser.parse(rpcMethod, inputMessage, messages); - - HttpBinding expected1 = - HttpBinding.builder().setName("name").setField(inputMessage.fieldMap().get("name")).build(); - HttpBinding expected2 = - HttpBinding.builder() - .setName("nested_object") - .setField(inputMessage.fieldMap().get("nested_object")) - .build(); - Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2); - } - - @Ignore - @Test - // request - // / \ - // nested_object name - // / \ - // name continent - // Given a request above, if nested_object.name is configured as path param, we should only - // include nested_object.continent and name as query param. - // However, the current logic put the name and the whole nested_object as query params, gax-java - // will then serialize all sub fields to query params. - // We need to either traverse all the leaf level fields and exclude field in the generator or pass - // the excluded fields to gax-java. Re-enable this test once - // https://github.com/googleapis/gapic-generator-java/issues/1041 is fixed - public void parseHttpAnnotation_shouldExcludeFieldsFromQueryParamsIfPathParamsAreConfigured() { - FileDescriptor fileDescriptor = HttpRuleParserTestingOuterClass.getDescriptor(); - ServiceDescriptor serviceDescriptor = fileDescriptor.getServices().get(0); - assertEquals("HttpRuleParserTesting", serviceDescriptor.getName()); - - Map messages = Parser.parseMessages(fileDescriptor); - - MethodDescriptor rpcMethod = - serviceDescriptor.getMethods().stream() - .filter( - methodDescriptor -> - methodDescriptor.getName().equals("ExcludePathParamsQueryParamTest")) - .findAny() - .get(); - Message inputMessage = messages.get("com.google.http.rule.parser.QueryParamRequest"); - - HttpBindings actual = HttpRuleParser.parse(rpcMethod, inputMessage, messages); - - Message nestedObjectMessage = messages.get("com.google.http.rule.parser.NestedObject"); - - HttpBinding expected1 = - HttpBinding.builder().setName("name").setField(inputMessage.fieldMap().get("name")).build(); - HttpBinding expected2 = - HttpBinding.builder() - .setName("nested_object.continent") - .setField(nestedObjectMessage.fieldMap().get("continent")) - .build(); - HttpBinding expectedPathParam = - HttpBinding.builder() - .setName("nested_object.name") - .setField(nestedObjectMessage.fieldMap().get("name")) - .build(); - - Truth.assertThat(new HashSet<>(actual.queryParameters())).containsExactly(expected1, expected2); - Truth.assertThat(new HashSet<>(actual.pathParameters())).containsExactly(expectedPathParam); - } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index 7b71d337b7..6800a70f8c 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -11,7 +11,6 @@ import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index b3258c0daf..25df0158b4 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -29,7 +29,6 @@ import java.io.IOException; import javax.annotation.Generated; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden index 05d848fe26..5fe2406751 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -3,7 +3,6 @@ package com.google.showcase.v1beta1.spring; import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index 4d3ab98065..c0a5400e7e 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -21,7 +21,6 @@ import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import javax.annotation.Generated; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @Generated("by gapic-generator-java") diff --git a/src/test/proto/compliance.proto b/src/test/proto/compliance.proto index 00f71a9c05..4467a387ab 100644 --- a/src/test/proto/compliance.proto +++ b/src/test/proto/compliance.proto @@ -80,44 +80,6 @@ service Compliance { get: "/v1beta1/repeat/{info.f_string=first/*}/{info.f_child.f_string=second/**}:pathtrailingresource" }; } - - // This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the - // .proto file, or a made-up enum value the is unknown to the client. To verify that clients can round-trip unknown enum vaues they receive, use the - // response from this RPC as the request to VerifyEnum() - // - // The values of enums sent by the server when a known or unknown value is requested will be the same within a single Showcase server run (this is needed for - // VerifyEnum() to work) but are not guaranteed to be the same across separate Showcase server runs. - rpc GetEnum(EnumRequest) returns (EnumResponse) { - option (google.api.http) = { - get: "/v1beta1/compliance/enum" - }; - } - - // This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() - // verifies that its request, which is presumably the response that the client previously got to a GetEnum(), contains the correct data. If so, it responds - // with the same EnumResponse; otherwise, the RPC errors. - // - // This works because the values of enums sent by the server when a known or unknown value is requested will be the same within a single Showcase server run, - // although they are not guaranteed to be the same across separate Showcase server runs. - rpc VerifyEnum(EnumResponse) returns (EnumResponse) { - option (google.api.http) = { - post: "/v1beta1/compliance/enum" - }; - } - -} - -message EnumRequest { - // Whether the client is requesting a new, unknown enum value or a known enum value already declard in this proto file. - bool unknown_enum = 1; -} - -message EnumResponse { - // The original request for a known or unknown enum from the server. - EnumRequest request = 1; - - // The actual enum the server provided. - Continent continent = 2; } message RepeatRequest { diff --git a/src/test/proto/http_rule_parser_testing.proto b/src/test/proto/http_rule_parser_testing.proto deleted file mode 100644 index d9946e2134..0000000000 --- a/src/test/proto/http_rule_parser_testing.proto +++ /dev/null @@ -1,63 +0,0 @@ -// 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 -// -// https://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. - -syntax = "proto3"; - -package google.http.rule.parser; - -import "google/api/annotations.proto"; -import "google/protobuf/empty.proto"; - -option java_package = "com.google.http.rule.parser"; -option java_multiple_files = true; - -// This service is only meant for unit testing HttpRuleParser -service HttpRuleParserTesting { - - // Test case for putting all fields to query params - rpc QueryParamHappyPathTest(QueryParamRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - post: "/v1/test" - }; - } - - // Test case for excluding path params from query params - rpc ExcludePathParamsQueryParamTest(QueryParamRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - post: "/v1/test/{nested_object.name}" - }; - } - - //TODO: Add more test cases once https://github.com/googleapis/gapic-generator-java/issues/1041 is fixed -} - -enum Continent { - CONTINENT_UNSPECIFIED = 0; - AFRICA = 1; - AMERICA = 2; - ANTARCTICA = 3; - AUSTRALIA = 4; - EUROPE = 5; -} - -message QueryParamRequest { - string name = 1; - NestedObject nested_object = 2; -} - -message NestedObject { - string name = 1; - Continent continent = 2; -} - diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java index 481d648922..61b2792c71 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/AsyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/AsyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_async] +// [START asset_v1_generated_assetserviceclient_analyzeiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicy() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_async] +// [END asset_v1_generated_assetserviceclient_analyzeiampolicy_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java index c12b5a21e4..bdb37c4140 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicy/SyncAnalyzeIamPolicy.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicy/SyncAnalyzeIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_sync] +// [START asset_v1_generated_assetserviceclient_analyzeiampolicy_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -45,4 +45,4 @@ public static void syncAnalyzeIamPolicy() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicy_sync] +// [END asset_v1_generated_assetserviceclient_analyzeiampolicy_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java index b7aa241702..089103aabe 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_async] +// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AssetServiceClient; @@ -49,4 +49,4 @@ public static void asyncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_async] +// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java index 1cdfa54f62..c2848431bf 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/AsyncAnalyzeIamPolicyLongrunningLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_LRO_async] +// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningMetadata; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; @@ -51,4 +51,4 @@ public static void asyncAnalyzeIamPolicyLongrunningLRO() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_LRO_async] +// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_lro_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java index 713f7e80bf..d180965d79 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzeiampolicylongrunning/SyncAnalyzeIamPolicyLongrunning.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_sync] +// [START asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest; import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -46,4 +46,4 @@ public static void syncAnalyzeIamPolicyLongrunning() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeIamPolicyLongrunning_sync] +// [END asset_v1_generated_assetserviceclient_analyzeiampolicylongrunning_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java index f0d93d7947..0bccc2c63b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/AsyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeMove_async] +// [START asset_v1_generated_assetserviceclient_analyzemove_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; @@ -47,4 +47,4 @@ public static void asyncAnalyzeMove() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeMove_async] +// [END asset_v1_generated_assetserviceclient_analyzemove_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java index be0348481f..dd975540ee 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/analyzemove/SyncAnalyzeMove.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_AnalyzeMove_sync] +// [START asset_v1_generated_assetserviceclient_analyzemove_sync] import com.google.cloud.asset.v1.AnalyzeMoveRequest; import com.google.cloud.asset.v1.AnalyzeMoveResponse; import com.google.cloud.asset.v1.AssetServiceClient; @@ -43,4 +43,4 @@ public static void syncAnalyzeMove() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_AnalyzeMove_sync] +// [END asset_v1_generated_assetserviceclient_analyzemove_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java index d031b2073b..8748ef9d6d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/AsyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/AsyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_async] +// [START asset_v1_generated_assetserviceclient_batchgetassetshistory_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; @@ -53,4 +53,4 @@ public static void asyncBatchGetAssetsHistory() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_async] +// [END asset_v1_generated_assetserviceclient_batchgetassetshistory_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 06719a2b83..cfb9e75eaa 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_sync] +// [START asset_v1_generated_assetserviceclient_batchgetassetshistory_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.BatchGetAssetsHistoryRequest; import com.google.cloud.asset.v1.BatchGetAssetsHistoryResponse; @@ -49,4 +49,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_BatchGetAssetsHistory_sync] +// [END asset_v1_generated_assetserviceclient_batchgetassetshistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java index 00ad2cefc5..913a1c1c0d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_Create_SetCredentialsProvider_sync] +// [START asset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END cloudasset_v1_generated_AssetService_Create_SetCredentialsProvider_sync] +// [END asset_v1_generated_assetserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java index 5ede353237..fa2c2a4b4e 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_Create_SetEndpoint_sync] +// [START asset_v1_generated_assetserviceclient_create_setendpoint_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.AssetServiceSettings; import com.google.cloud.asset.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings); } } -// [END cloudasset_v1_generated_AssetService_Create_SetEndpoint_sync] +// [END asset_v1_generated_assetserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java index f33ae5d4c0..060c56a764 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/AsyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/AsyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_CreateFeed_async] +// [START asset_v1_generated_assetserviceclient_createfeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; @@ -47,4 +47,4 @@ public static void asyncCreateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_CreateFeed_async] +// [END asset_v1_generated_assetserviceclient_createfeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java index cd83f15a3b..fea0a079f6 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_CreateFeed_sync] +// [START asset_v1_generated_assetserviceclient_createfeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.CreateFeedRequest; import com.google.cloud.asset.v1.Feed; @@ -44,4 +44,4 @@ public static void syncCreateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_CreateFeed_sync] +// [END asset_v1_generated_assetserviceclient_createfeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java index f6fc682365..66eddd4c27 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/createfeed/SyncCreateFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/createfeed/SyncCreateFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_CreateFeed_String_sync] +// [START asset_v1_generated_assetserviceclient_createfeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncCreateFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_CreateFeed_String_sync] +// [END asset_v1_generated_assetserviceclient_createfeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java index f37354d875..cc5bdb96e8 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/AsyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_DeleteFeed_async] +// [START asset_v1_generated_assetserviceclient_deletefeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_DeleteFeed_async] +// [END asset_v1_generated_assetserviceclient_deletefeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java index 051f44738c..1786f511b9 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_DeleteFeed_sync] +// [START asset_v1_generated_assetserviceclient_deletefeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncDeleteFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_DeleteFeed_sync] +// [END asset_v1_generated_assetserviceclient_deletefeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java index ca8460944c..b16984b667 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_DeleteFeed_Feedname_sync] +// [START asset_v1_generated_assetserviceclient_deletefeed_feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedFeedname() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_DeleteFeed_Feedname_sync] +// [END asset_v1_generated_assetserviceclient_deletefeed_feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java index 7430704233..0ec0024d65 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/deletefeed/SyncDeleteFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_DeleteFeed_String_sync] +// [START asset_v1_generated_assetserviceclient_deletefeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_DeleteFeed_String_sync] +// [END asset_v1_generated_assetserviceclient_deletefeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java index db5d626354..052bfdc1c8 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ExportAssets_async] +// [START asset_v1_generated_assetserviceclient_exportassets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -54,4 +54,4 @@ public static void asyncExportAssets() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ExportAssets_async] +// [END asset_v1_generated_assetserviceclient_exportassets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java index 09d797bd50..c136521b17 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/AsyncExportAssetsLRO.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/AsyncExportAssetsLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ExportAssets_LRO_async] +// [START asset_v1_generated_assetserviceclient_exportassets_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -55,4 +55,4 @@ public static void asyncExportAssetsLRO() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ExportAssets_LRO_async] +// [END asset_v1_generated_assetserviceclient_exportassets_lro_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java index 60b9bc4434..599bfc76de 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/exportassets/SyncExportAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/exportassets/SyncExportAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ExportAssets_sync] +// [START asset_v1_generated_assetserviceclient_exportassets_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; import com.google.cloud.asset.v1.ExportAssetsRequest; @@ -51,4 +51,4 @@ public static void syncExportAssets() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ExportAssets_sync] +// [END asset_v1_generated_assetserviceclient_exportassets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java index 8acd1e2b02..40de97de9e 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/AsyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_GetFeed_async] +// [START asset_v1_generated_assetserviceclient_getfeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -46,4 +46,4 @@ public static void asyncGetFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_GetFeed_async] +// [END asset_v1_generated_assetserviceclient_getfeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java index f6813afc5f..0490c1c1ea 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_GetFeed_sync] +// [START asset_v1_generated_assetserviceclient_getfeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -43,4 +43,4 @@ public static void syncGetFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_GetFeed_sync] +// [END asset_v1_generated_assetserviceclient_getfeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java index 978518747f..f697ff3f5b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedFeedname.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_GetFeed_Feedname_sync] +// [START asset_v1_generated_assetserviceclient_getfeed_feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedFeedname() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_GetFeed_Feedname_sync] +// [END asset_v1_generated_assetserviceclient_getfeed_feedname_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java index e85a2f8f77..9e750f6c08 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/getfeed/SyncGetFeedString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/getfeed/SyncGetFeedString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_GetFeed_String_sync] +// [START asset_v1_generated_assetserviceclient_getfeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.FeedName; @@ -39,4 +39,4 @@ public static void syncGetFeedString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_GetFeed_String_sync] +// [END asset_v1_generated_assetserviceclient_getfeed_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java index d20f247b00..785a9297d5 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListAssets_async] +// [START asset_v1_generated_assetserviceclient_listassets_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -56,4 +56,4 @@ public static void asyncListAssets() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListAssets_async] +// [END asset_v1_generated_assetserviceclient_listassets_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java index ff9fb130ea..4c1b35e2b0 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/AsyncListAssetsPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/AsyncListAssetsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListAssets_Paged_async] +// [START asset_v1_generated_assetserviceclient_listassets_paged_async] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -64,4 +64,4 @@ public static void asyncListAssetsPaged() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListAssets_Paged_async] +// [END asset_v1_generated_assetserviceclient_listassets_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java index ce3f71caa0..0d05589a3b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssets.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssets.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListAssets_sync] +// [START asset_v1_generated_assetserviceclient_listassets_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ContentType; @@ -53,4 +53,4 @@ public static void syncListAssets() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListAssets_sync] +// [END asset_v1_generated_assetserviceclient_listassets_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java index bef9f5c125..7943dc999d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsResourcename.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsResourcename.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListAssets_Resourcename_sync] +// [START asset_v1_generated_assetserviceclient_listassets_resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; @@ -61,4 +61,4 @@ public String toString() { } } } -// [END cloudasset_v1_generated_AssetService_ListAssets_Resourcename_sync] +// [END asset_v1_generated_assetserviceclient_listassets_resourcename_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java index 6c87901659..ddc3aa7ea5 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listassets/SyncListAssetsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listassets/SyncListAssetsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListAssets_String_sync] +// [START asset_v1_generated_assetserviceclient_listassets_string_sync] import com.google.cloud.asset.v1.Asset; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; @@ -41,4 +41,4 @@ public static void syncListAssetsString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListAssets_String_sync] +// [END asset_v1_generated_assetserviceclient_listassets_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java index 4207a2ba55..3e47fc647d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/AsyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListFeeds_async] +// [START asset_v1_generated_assetserviceclient_listfeeds_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; @@ -44,4 +44,4 @@ public static void asyncListFeeds() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListFeeds_async] +// [END asset_v1_generated_assetserviceclient_listfeeds_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java similarity index 92% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java index 8f4c9daa94..8bff72705d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeeds.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListFeeds_sync] +// [START asset_v1_generated_assetserviceclient_listfeeds_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsRequest; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -40,4 +40,4 @@ public static void syncListFeeds() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListFeeds_sync] +// [END asset_v1_generated_assetserviceclient_listfeeds_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java index 3c94affab0..3d6a842eeb 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/listfeeds/SyncListFeedsString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/listfeeds/SyncListFeedsString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_ListFeeds_String_sync] +// [START asset_v1_generated_assetserviceclient_listfeeds_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ListFeedsResponse; @@ -38,4 +38,4 @@ public static void syncListFeedsString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_ListFeeds_String_sync] +// [END asset_v1_generated_assetserviceclient_listfeeds_string_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java index 12d0a7e183..7e7a38c530 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_async] +// [START asset_v1_generated_assetserviceclient_searchalliampolicies_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -54,4 +54,4 @@ public static void asyncSearchAllIamPolicies() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_async] +// [END asset_v1_generated_assetserviceclient_searchalliampolicies_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java index 73e3439862..4de6b3f53a 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_Paged_async] +// [START asset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -62,4 +62,4 @@ public static void asyncSearchAllIamPoliciesPaged() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_Paged_async] +// [END asset_v1_generated_assetserviceclient_searchalliampolicies_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java index 76c9f0f56b..50ee2ef294 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPolicies.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPolicies.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_sync] +// [START asset_v1_generated_assetserviceclient_searchalliampolicies_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; import com.google.cloud.asset.v1.SearchAllIamPoliciesRequest; @@ -51,4 +51,4 @@ public static void syncSearchAllIamPolicies() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_sync] +// [END asset_v1_generated_assetserviceclient_searchalliampolicies_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java similarity index 90% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java index 61af31efa3..2704f9be42 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchalliampolicies/SyncSearchAllIamPoliciesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllIamPolicies_StringString_sync] +// [START asset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.IamPolicySearchResult; @@ -42,4 +42,4 @@ public static void syncSearchAllIamPoliciesStringString() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllIamPolicies_StringString_sync] +// [END asset_v1_generated_assetserviceclient_searchalliampolicies_stringstring_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java index 7fb2de5a48..5d8a22c234 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllResources_async] +// [START asset_v1_generated_assetserviceclient_searchallresources_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; @@ -56,4 +56,4 @@ public static void asyncSearchAllResources() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllResources_async] +// [END asset_v1_generated_assetserviceclient_searchallresources_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java similarity index 94% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java index 06586914a2..c025ac210b 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/AsyncSearchAllResourcesPaged.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/AsyncSearchAllResourcesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllResources_Paged_async] +// [START asset_v1_generated_assetserviceclient_searchallresources_paged_async] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -64,4 +64,4 @@ public static void asyncSearchAllResourcesPaged() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllResources_Paged_async] +// [END asset_v1_generated_assetserviceclient_searchallresources_paged_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java index 5f8724fe34..5aeb9954d7 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResources.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResources.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllResources_sync] +// [START asset_v1_generated_assetserviceclient_searchallresources_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import com.google.cloud.asset.v1.SearchAllResourcesRequest; @@ -53,4 +53,4 @@ public static void syncSearchAllResources() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_SearchAllResources_sync] +// [END asset_v1_generated_assetserviceclient_searchallresources_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java similarity index 90% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java index b62bcc4348..7e87019e5d 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/searchallresources/SyncSearchAllResourcesStringStringListstring.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_SearchAllResources_StringStringListstring_sync] +// [START asset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.ResourceSearchResult; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncSearchAllResourcesStringStringListstring() throws Excepti } } } -// [END cloudasset_v1_generated_AssetService_SearchAllResources_StringStringListstring_sync] +// [END asset_v1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java index 8a0a05656f..4239ca9a66 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/AsyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_UpdateFeed_async] +// [START asset_v1_generated_assetserviceclient_updatefeed_async] import com.google.api.core.ApiFuture; import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -47,4 +47,4 @@ public static void asyncUpdateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_UpdateFeed_async] +// [END asset_v1_generated_assetserviceclient_updatefeed_async] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java similarity index 93% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java index b209292a95..691eb8a262 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_UpdateFeed_sync] +// [START asset_v1_generated_assetserviceclient_updatefeed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; import com.google.cloud.asset.v1.UpdateFeedRequest; @@ -44,4 +44,4 @@ public static void syncUpdateFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_UpdateFeed_sync] +// [END asset_v1_generated_assetserviceclient_updatefeed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java similarity index 91% rename from test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java rename to test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java index bdf9957e77..dd9bbaba40 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservice/updatefeed/SyncUpdateFeedFeed.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetService_UpdateFeed_Feed_sync] +// [START asset_v1_generated_assetserviceclient_updatefeed_feed_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.Feed; @@ -38,4 +38,4 @@ public static void syncUpdateFeedFeed() throws Exception { } } } -// [END cloudasset_v1_generated_AssetService_UpdateFeed_Feed_sync] +// [END asset_v1_generated_assetserviceclient_updatefeed_feed_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 02f4b3c771..d7822c14a4 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/assetservicesettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START cloudasset_v1_generated_AssetServiceSettings_BatchGetAssetsHistory_sync] +// [START asset_v1_generated_assetservicesettings_batchgetassetshistory_sync] import com.google.cloud.asset.v1.AssetServiceSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END cloudasset_v1_generated_AssetServiceSettings_BatchGetAssetsHistory_sync] +// [END asset_v1_generated_assetservicesettings_batchgetassetshistory_sync] diff --git a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java index 31de0fc591..2458f13c31 100644 --- a/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java +++ b/test/integration/goldens/asset/samples/snippets/generated/main/java/com/google/cloud/asset/v1/stub/assetservicestubsettings/batchgetassetshistory/SyncBatchGetAssetsHistory.java @@ -16,7 +16,7 @@ package com.google.cloud.asset.v1.stub.samples; -// [START cloudasset_v1_generated_AssetServiceStubSettings_BatchGetAssetsHistory_sync] +// [START asset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] import com.google.cloud.asset.v1.stub.AssetServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncBatchGetAssetsHistory() throws Exception { AssetServiceStubSettings assetServiceSettings = assetServiceSettingsBuilder.build(); } } -// [END cloudasset_v1_generated_AssetServiceStubSettings_BatchGetAssetsHistory_sync] +// [END asset_v1_generated_assetservicestubsettings_batchgetassetshistory_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java index d7d8937ff7..c239cb97cc 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/AsyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; @@ -56,4 +56,4 @@ public static void asyncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java index cf3eb73ece..f091b9029c 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_sync] import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java index 1951fd7be8..7c13ec3e96 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java index 7999251391..546c08d12b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutationstring_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_stringbytestringrowfilterlistmutationlistmutationstring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java index 94b3498d56..855a486e1c 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowTablenameBytestringRowfilterListmutation } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java index ae5cef236b..10427749d1 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutationstring_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -53,4 +53,4 @@ public static void main(String[] args) throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_checkandmutaterow_tablenamebytestringrowfilterlistmutationlistmutationstring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java index 7f26aef4f9..98cefb28e7 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] +// [START bigtable_v2_generated_basebigtabledataclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] +// [END bigtable_v2_generated_basebigtabledataclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java index c1a6d75ae8..508e397d2a 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] +// [START bigtable_v2_generated_basebigtabledataclient_create_setendpoint_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import com.google.cloud.bigtable.data.v2.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] +// [END bigtable_v2_generated_basebigtabledataclient_create_setendpoint_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java index 7475c57d0a..c0cbcf3237 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/AsyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_async] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; @@ -53,4 +53,4 @@ public static void asyncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_async] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java index 1d7439c6ca..afe159a613 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_sync] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_sync] import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -49,4 +49,4 @@ public static void syncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_sync] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java index 03d7191440..11d1351a6e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowStringBytestringListmutation() throws Exception } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java index dc2ce87b85..5aec68b28f 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowStringBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutationstring_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowStringBytestringListmutationString() throws Exce } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_stringbytestringlistmutationstring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java index bab53b1aa9..98649dea1b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowTablenameBytestringListmutation() throws Excepti } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java index 3802b87ef1..2aadd5ed5e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutationstring_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowTablenameBytestringListmutationString() throws E } } } -// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterow_tablenamebytestringlistmutationstring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java index 452920dccf..06c1b8b139 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/mutaterows/AsyncMutateRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_MutateRows_async] +// [START bigtable_v2_generated_basebigtabledataclient_mutaterows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.MutateRowsRequest; import com.google.bigtable.v2.MutateRowsResponse; @@ -51,4 +51,4 @@ public static void asyncMutateRows() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_MutateRows_async] +// [END bigtable_v2_generated_basebigtabledataclient_mutaterows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java index 8ff05b78fb..25998e9002 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/AsyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; @@ -53,4 +53,4 @@ public static void asyncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java index 4fc565753f..efc0c77519 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_sync] import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; @@ -49,4 +49,4 @@ public static void syncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java index 0d065192e7..9fe3f73534 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java index 958365977e..37c5e6bf52 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterulestring_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_stringbytestringlistreadmodifywriterulestring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java index 9369754dfa..1e89e38cc9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java index db2d6d950b..b276b946bd 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterulestring_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_basebigtabledataclient_readmodifywriterow_tablenamebytestringlistreadmodifywriterulestring_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java index 3228987659..5132872889 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/readrows/AsyncReadRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_ReadRows_async] +// [START bigtable_v2_generated_basebigtabledataclient_readrows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.ReadRowsRequest; import com.google.bigtable.v2.ReadRowsResponse; @@ -54,4 +54,4 @@ public static void asyncReadRows() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_ReadRows_async] +// [END bigtable_v2_generated_basebigtabledataclient_readrows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java index 113942be30..a2e0468a45 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledataclient/samplerowkeys/AsyncSampleRowKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_Bigtable_SampleRowKeys_async] +// [START bigtable_v2_generated_basebigtabledataclient_samplerowkeys_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; @@ -49,4 +49,4 @@ public static void asyncSampleRowKeys() throws Exception { } } } -// [END bigtable_v2_generated_Bigtable_SampleRowKeys_async] +// [END bigtable_v2_generated_basebigtabledataclient_samplerowkeys_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java index 9b3ac3557e..216212eac8 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledatasettings/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableDataSettings_MutateRow_sync] +// [START bigtable_v2_generated_basebigtabledatasettings_mutaterow_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncMutateRow() throws Exception { BaseBigtableDataSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build(); } } -// [END bigtable_v2_generated_BaseBigtableDataSettings_MutateRow_sync] +// [END bigtable_v2_generated_basebigtabledatasettings_mutaterow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java index 3194f8487c..be5058d4a5 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/stub/bigtablestubsettings/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.stub.samples; -// [START bigtable_v2_generated_BigtableStubSettings_MutateRow_sync] +// [START bigtable_v2_generated_bigtablestubsettings_mutaterow_sync] import com.google.cloud.bigtable.data.v2.stub.BigtableStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncMutateRow() throws Exception { BigtableStubSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build(); } } -// [END bigtable_v2_generated_BigtableStubSettings_MutateRow_sync] +// [END bigtable_v2_generated_bigtablestubsettings_mutaterow_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java index fd623a44bf..2c48e6113d 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_AggregatedList_async] +// [START compute_v1small_generated_addressesclient_aggregatedlist_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; @@ -54,4 +54,4 @@ public static void asyncAggregatedList() throws Exception { } } } -// [END compute_v1small_generated_Addresses_AggregatedList_async] +// [END compute_v1small_generated_addressesclient_aggregatedlist_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java index 333c757c68..cc8ac49447 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/AsyncAggregatedListPaged.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/AsyncAggregatedListPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_AggregatedList_Paged_async] +// [START compute_v1small_generated_addressesclient_aggregatedlist_paged_async] import com.google.cloud.compute.v1small.AddressAggregatedList; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; @@ -61,4 +61,4 @@ public static void asyncAggregatedListPaged() throws Exception { } } } -// [END compute_v1small_generated_Addresses_AggregatedList_Paged_async] +// [END compute_v1small_generated_addressesclient_aggregatedlist_paged_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java index 21afc1d2c0..64c49a659c 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_AggregatedList_sync] +// [START compute_v1small_generated_addressesclient_aggregatedlist_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; import com.google.cloud.compute.v1small.AggregatedListAddressesRequest; @@ -51,4 +51,4 @@ public static void syncAggregatedList() throws Exception { } } } -// [END compute_v1small_generated_Addresses_AggregatedList_sync] +// [END compute_v1small_generated_addressesclient_aggregatedlist_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java index 0320dc1970..8584dc2601 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/aggregatedlist/SyncAggregatedListString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/aggregatedlist/SyncAggregatedListString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_AggregatedList_String_sync] +// [START compute_v1small_generated_addressesclient_aggregatedlist_string_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesScopedList; import java.util.Map; @@ -42,4 +42,4 @@ public static void syncAggregatedListString() throws Exception { } } } -// [END compute_v1small_generated_Addresses_AggregatedList_String_sync] +// [END compute_v1small_generated_addressesclient_aggregatedlist_string_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java index ee626b3833..ba36dc70c4 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Create_SetCredentialsProvider_sync] +// [START compute_v1small_generated_addressesclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { AddressesClient addressesClient = AddressesClient.create(addressesSettings); } } -// [END compute_v1small_generated_Addresses_Create_SetCredentialsProvider_sync] +// [END compute_v1small_generated_addressesclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java index 49a9b34bf3..8176f67fda 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Create_SetEndpoint_sync] +// [START compute_v1small_generated_addressesclient_create_setendpoint_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.AddressesSettings; import com.google.cloud.compute.v1small.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { AddressesClient addressesClient = AddressesClient.create(addressesSettings); } } -// [END compute_v1small_generated_Addresses_Create_SetEndpoint_sync] +// [END compute_v1small_generated_addressesclient_create_setendpoint_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java index 53a63b72eb..1beebc8372 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDelete.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDelete.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Delete_async] +// [START compute_v1small_generated_addressesclient_delete_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; @@ -48,4 +48,4 @@ public static void asyncDelete() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Delete_async] +// [END compute_v1small_generated_addressesclient_delete_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java index 86c2dc5992..ce650ce314 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/AsyncDeleteLRO.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/AsyncDeleteLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Delete_LRO_async] +// [START compute_v1small_generated_addressesclient_delete_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteLRO() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Delete_LRO_async] +// [END compute_v1small_generated_addressesclient_delete_lro_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java index 8cc976a9a1..ca1be3321b 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDelete.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDelete.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Delete_sync] +// [START compute_v1small_generated_addressesclient_delete_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.DeleteAddressRequest; import com.google.cloud.compute.v1small.Operation; @@ -45,4 +45,4 @@ public static void syncDelete() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Delete_sync] +// [END compute_v1small_generated_addressesclient_delete_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java index d9152c6c41..85e0501168 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/delete/SyncDeleteStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/delete/SyncDeleteStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Delete_StringStringString_sync] +// [START compute_v1small_generated_addressesclient_delete_stringstringstring_sync] import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.Operation; @@ -40,4 +40,4 @@ public static void syncDeleteStringStringString() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Delete_StringStringString_sync] +// [END compute_v1small_generated_addressesclient_delete_stringstringstring_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java index c4004a223d..be58773685 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsert.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsert.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Insert_async] +// [START compute_v1small_generated_addressesclient_insert_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -49,4 +49,4 @@ public static void asyncInsert() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Insert_async] +// [END compute_v1small_generated_addressesclient_insert_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java index 4e70ce04b1..502fe4c8e2 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/AsyncInsertLRO.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/AsyncInsertLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Insert_LRO_async] +// [START compute_v1small_generated_addressesclient_insert_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -50,4 +50,4 @@ public static void asyncInsertLRO() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Insert_LRO_async] +// [END compute_v1small_generated_addressesclient_insert_lro_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java index 3c38ab50fb..494a59828e 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsert.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsert.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Insert_sync] +// [START compute_v1small_generated_addressesclient_insert_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.InsertAddressRequest; @@ -46,4 +46,4 @@ public static void syncInsert() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Insert_sync] +// [END compute_v1small_generated_addressesclient_insert_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java index 3f6d001f75..1e9683a4d1 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/insert/SyncInsertStringStringAddress.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/insert/SyncInsertStringStringAddress.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_Insert_StringStringAddress_sync] +// [START compute_v1small_generated_addressesclient_insert_stringstringaddress_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.Operation; @@ -41,4 +41,4 @@ public static void syncInsertStringStringAddress() throws Exception { } } } -// [END compute_v1small_generated_Addresses_Insert_StringStringAddress_sync] +// [END compute_v1small_generated_addressesclient_insert_stringstringaddress_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java index 89088a5a04..af52a45ec7 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_List_async] +// [START compute_v1small_generated_addressesclient_list_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -52,4 +52,4 @@ public static void asyncList() throws Exception { } } } -// [END compute_v1small_generated_Addresses_List_async] +// [END compute_v1small_generated_addressesclient_list_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java index e749bc7595..660ec082b8 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/AsyncListPaged.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/AsyncListPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_List_Paged_async] +// [START compute_v1small_generated_addressesclient_list_paged_async] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressList; import com.google.cloud.compute.v1small.AddressesClient; @@ -60,4 +60,4 @@ public static void asyncListPaged() throws Exception { } } } -// [END compute_v1small_generated_Addresses_List_Paged_async] +// [END compute_v1small_generated_addressesclient_list_paged_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java similarity index 94% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java index 3c105181a7..6b7f31ada7 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_List_sync] +// [START compute_v1small_generated_addressesclient_list_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; import com.google.cloud.compute.v1small.ListAddressesRequest; @@ -49,4 +49,4 @@ public static void syncList() throws Exception { } } } -// [END compute_v1small_generated_Addresses_List_sync] +// [END compute_v1small_generated_addressesclient_list_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java index bc47d773c9..ee547f1107 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addresses/list/SyncListStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressesclient/list/SyncListStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_Addresses_List_StringStringString_sync] +// [START compute_v1small_generated_addressesclient_list_stringstringstring_sync] import com.google.cloud.compute.v1small.Address; import com.google.cloud.compute.v1small.AddressesClient; @@ -42,4 +42,4 @@ public static void syncListStringStringString() throws Exception { } } } -// [END compute_v1small_generated_Addresses_List_StringStringString_sync] +// [END compute_v1small_generated_addressesclient_list_stringstringstring_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java index fa405f919b..d2b76886b0 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/addressessettings/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_AddressesSettings_AggregatedList_sync] +// [START compute_v1small_generated_addressessettings_aggregatedlist_sync] import com.google.cloud.compute.v1small.AddressesSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncAggregatedList() throws Exception { AddressesSettings addressesSettings = addressesSettingsBuilder.build(); } } -// [END compute_v1small_generated_AddressesSettings_AggregatedList_sync] +// [END compute_v1small_generated_addressessettings_aggregatedlist_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java index 2768ddd357..9a7c59a44a 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Create_SetCredentialsProvider_sync] +// [START compute_v1small_generated_regionoperationsclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.RegionOperationsSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { RegionOperationsClient.create(regionOperationsSettings); } } -// [END compute_v1small_generated_RegionOperations_Create_SetCredentialsProvider_sync] +// [END compute_v1small_generated_regionoperationsclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java index d8bbb778d7..98f3320db3 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Create_SetEndpoint_sync] +// [START compute_v1small_generated_regionoperationsclient_create_setendpoint_sync] import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.RegionOperationsSettings; import com.google.cloud.compute.v1small.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { RegionOperationsClient.create(regionOperationsSettings); } } -// [END compute_v1small_generated_RegionOperations_Create_SetEndpoint_sync] +// [END compute_v1small_generated_regionoperationsclient_create_setendpoint_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java index ab424fc0c1..ae4ba65890 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/AsyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/AsyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Get_async] +// [START compute_v1small_generated_regionoperationsclient_get_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.GetRegionOperationRequest; import com.google.cloud.compute.v1small.Operation; @@ -47,4 +47,4 @@ public static void asyncGet() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Get_async] +// [END compute_v1small_generated_regionoperationsclient_get_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java index 59138ed2e8..caaa2ce9ec 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Get_sync] +// [START compute_v1small_generated_regionoperationsclient_get_sync] import com.google.cloud.compute.v1small.GetRegionOperationRequest; import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -44,4 +44,4 @@ public static void syncGet() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Get_sync] +// [END compute_v1small_generated_regionoperationsclient_get_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java index 00ebf2a01e..64eb451264 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/get/SyncGetStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/get/SyncGetStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Get_StringStringString_sync] +// [START compute_v1small_generated_regionoperationsclient_get_stringstringstring_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -40,4 +40,4 @@ public static void syncGetStringStringString() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Get_StringStringString_sync] +// [END compute_v1small_generated_regionoperationsclient_get_stringstringstring_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java similarity index 93% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java index f02fcb2fad..52ae3a1ff1 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/AsyncWait.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/AsyncWait.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Wait_async] +// [START compute_v1small_generated_regionoperationsclient_wait_async] import com.google.api.core.ApiFuture; import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -47,4 +47,4 @@ public static void asyncWait() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Wait_async] +// [END compute_v1small_generated_regionoperationsclient_wait_async] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java similarity index 92% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java index 41c9b22574..8b1947a19a 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWait.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWait.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Wait_sync] +// [START compute_v1small_generated_regionoperationsclient_wait_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; import com.google.cloud.compute.v1small.WaitRegionOperationRequest; @@ -44,4 +44,4 @@ public static void syncWait() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Wait_sync] +// [END compute_v1small_generated_regionoperationsclient_wait_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java similarity index 90% rename from test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java rename to test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java index 791fdfe170..da7031e67a 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperations/wait/SyncWaitStringStringString.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationsclient/wait/SyncWaitStringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperations_Wait_StringStringString_sync] +// [START compute_v1small_generated_regionoperationsclient_wait_stringstringstring_sync] import com.google.cloud.compute.v1small.Operation; import com.google.cloud.compute.v1small.RegionOperationsClient; @@ -40,4 +40,4 @@ public static void syncWaitStringStringString() throws Exception { } } } -// [END compute_v1small_generated_RegionOperations_Wait_StringStringString_sync] +// [END compute_v1small_generated_regionoperationsclient_wait_stringstringstring_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java index 87bb6ca330..e599705557 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/regionoperationssettings/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.samples; -// [START compute_v1small_generated_RegionOperationsSettings_Get_sync] +// [START compute_v1small_generated_regionoperationssettings_get_sync] import com.google.cloud.compute.v1small.RegionOperationsSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGet() throws Exception { RegionOperationsSettings regionOperationsSettings = regionOperationsSettingsBuilder.build(); } } -// [END compute_v1small_generated_RegionOperationsSettings_Get_sync] +// [END compute_v1small_generated_regionoperationssettings_get_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java index 4d7ea1ee76..32a9994c46 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/addressesstubsettings/aggregatedlist/SyncAggregatedList.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.stub.samples; -// [START compute_v1small_generated_AddressesStubSettings_AggregatedList_sync] +// [START compute_v1small_generated_addressesstubsettings_aggregatedlist_sync] import com.google.cloud.compute.v1small.stub.AddressesStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncAggregatedList() throws Exception { AddressesStubSettings addressesSettings = addressesSettingsBuilder.build(); } } -// [END compute_v1small_generated_AddressesStubSettings_AggregatedList_sync] +// [END compute_v1small_generated_addressesstubsettings_aggregatedlist_sync] diff --git a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java index 4e2e67f189..956110de2e 100644 --- a/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java +++ b/test/integration/goldens/compute/samples/snippets/generated/main/java/com/google/cloud/compute/v1small/stub/regionoperationsstubsettings/get/SyncGet.java @@ -16,7 +16,7 @@ package com.google.cloud.compute.v1small.stub.samples; -// [START compute_v1small_generated_RegionOperationsStubSettings_Get_sync] +// [START compute_v1small_generated_regionoperationsstubsettings_get_sync] import com.google.cloud.compute.v1small.stub.RegionOperationsStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGet() throws Exception { RegionOperationsStubSettings regionOperationsSettings = regionOperationsSettingsBuilder.build(); } } -// [END compute_v1small_generated_RegionOperationsStubSettings_Get_sync] +// [END compute_v1small_generated_regionoperationsstubsettings_get_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java index 129efb9d77..6ccb0e85c0 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] +// [START credentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] +// [END credentials_v1_generated_iamcredentialsclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java index 186d106cf4..f70e6e791d 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] +// [START credentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import com.google.cloud.iam.credentials.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] +// [END credentials_v1_generated_iamcredentialsclient_create_setendpoint_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java index 08e741cc66..93836ff228 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/AsyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] +// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; @@ -52,4 +52,4 @@ public static void asyncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] +// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java index 2a673667d2..58dd152c7c 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -48,4 +48,4 @@ public static void syncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java index d0f33dd855..0a292c07fc 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -47,4 +47,4 @@ public static void syncGenerateAccessTokenServiceaccountnameListstringListstring } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_serviceaccountnameliststringliststringduration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java index 677d546b13..39c08418a6 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateAccessTokenStringListstringListstringDuration() t } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateaccesstoken_stringliststringliststringduration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java index 14a6f9a845..c944008968 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/AsyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] +// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; @@ -51,4 +51,4 @@ public static void asyncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] +// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java index 324dd1adf3..aef054705b 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -47,4 +47,4 @@ public static void syncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java similarity index 89% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java index cd3c4aafc4..b40ed382f4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateIdTokenServiceaccountnameListstringStringBoolean( } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_serviceaccountnameliststringstringboolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java index 373f8a35de..1dc6a89465 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [START credentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -45,4 +45,4 @@ public static void syncGenerateIdTokenStringListstringStringBoolean() throws Exc } } } -// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [END credentials_v1_generated_iamcredentialsclient_generateidtoken_stringliststringstringboolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java index 6cafdbbfcd..eadd080889 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/AsyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_async] +// [START credentials_v1_generated_iamcredentialsclient_signblob_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -51,4 +51,4 @@ public static void asyncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_async] +// [END credentials_v1_generated_iamcredentialsclient_signblob_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java index a4726eba69..629c21bceb 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] +// [START credentials_v1_generated_iamcredentialsclient_signblob_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobRequest; @@ -47,4 +47,4 @@ public static void syncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] +// [END credentials_v1_generated_iamcredentialsclient_signblob_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java index 60eb3b8789..7d6157ae55 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [START credentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobServiceaccountnameListstringBytestring() throws E } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [END credentials_v1_generated_iamcredentialsclient_signblob_serviceaccountnameliststringbytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java similarity index 91% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java index bd0c2f01bb..0dd909a0fa 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signblob/SyncSignBlobStringListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] +// [START credentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobStringListstringBytestring() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] +// [END credentials_v1_generated_iamcredentialsclient_signblob_stringliststringbytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java index d17fc4c438..1d59d04e5f 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/AsyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_async] +// [START credentials_v1_generated_iamcredentialsclient_signjwt_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -50,4 +50,4 @@ public static void asyncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_async] +// [END credentials_v1_generated_iamcredentialsclient_signjwt_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java similarity index 93% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java index 77586e2558..648d1d2717 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] +// [START credentials_v1_generated_iamcredentialsclient_signjwt_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtRequest; @@ -46,4 +46,4 @@ public static void syncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] +// [END credentials_v1_generated_iamcredentialsclient_signjwt_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java similarity index 90% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java index 5ed7463567..4d3775724d 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtServiceaccountnameListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [START credentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtServiceaccountnameListstringString() throws Except } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [END credentials_v1_generated_iamcredentialsclient_signjwt_serviceaccountnameliststringstring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java similarity index 91% rename from test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java rename to test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java index 04ebefdbbc..f4f44cb917 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialsclient/signjwt/SyncSignJwtStringListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] +// [START credentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtStringListstringString() throws Exception { } } } -// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] +// [END credentials_v1_generated_iamcredentialsclient_signjwt_stringliststringstring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java index 2e6a9be158..0ec7154cc9 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentialssettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentialsSettings_GenerateAccessToken_sync] +// [START credentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END iamcredentials_v1_generated_IamCredentialsSettings_GenerateAccessToken_sync] +// [END credentials_v1_generated_iamcredentialssettings_generateaccesstoken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java index f23179fcee..a36e698604 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/stub/iamcredentialsstubsettings/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.stub.samples; -// [START iamcredentials_v1_generated_IamCredentialsStubSettings_GenerateAccessToken_sync] +// [START credentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGenerateAccessToken() throws Exception { IamCredentialsStubSettings iamCredentialsSettings = iamCredentialsSettingsBuilder.build(); } } -// [END iamcredentials_v1_generated_IamCredentialsStubSettings_GenerateAccessToken_sync] +// [END credentials_v1_generated_iamcredentialsstubsettings_generateaccesstoken_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java index 5b8e4b2079..4cd74600b9 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_Create_SetCredentialsProvider_sync] +// [START iam_v1_generated_iampolicyclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.IAMPolicySettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IAMPolicyClient iAMPolicyClient = IAMPolicyClient.create(iAMPolicySettings); } } -// [END iam_v1_generated_IAMPolicy_Create_SetCredentialsProvider_sync] +// [END iam_v1_generated_iampolicyclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java index fe71ec9934..16fdc64355 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_Create_SetEndpoint_sync] +// [START iam_v1_generated_iampolicyclient_create_setendpoint_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.IAMPolicySettings; import com.google.iam.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IAMPolicyClient iAMPolicyClient = IAMPolicyClient.create(iAMPolicySettings); } } -// [END iam_v1_generated_IAMPolicy_Create_SetEndpoint_sync] +// [END iam_v1_generated_iampolicyclient_create_setendpoint_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java index 768a0bde7c..441d834597 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_GetIamPolicy_async] +// [START iam_v1_generated_iampolicyclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -47,4 +47,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_GetIamPolicy_async] +// [END iam_v1_generated_iampolicyclient_getiampolicy_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java index 6a2c286638..ac82d3739c 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_GetIamPolicy_sync] +// [START iam_v1_generated_iampolicyclient_getiampolicy_sync] import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; import com.google.iam.v1.IAMPolicyClient; @@ -44,4 +44,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_GetIamPolicy_sync] +// [END iam_v1_generated_iampolicyclient_getiampolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java index fdcde733d3..2aea2886b9 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_SetIamPolicy_async] +// [START iam_v1_generated_iampolicyclient_setiampolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.Policy; @@ -46,4 +46,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_SetIamPolicy_async] +// [END iam_v1_generated_iampolicyclient_setiampolicy_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java index 55d362db48..9e01e5cf1f 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_SetIamPolicy_sync] +// [START iam_v1_generated_iampolicyclient_setiampolicy_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -43,4 +43,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_SetIamPolicy_sync] +// [END iam_v1_generated_iampolicyclient_setiampolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java index ebaa1ba351..4e7920f9cc 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_TestIamPermissions_async] +// [START iam_v1_generated_iampolicyclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -48,4 +48,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_TestIamPermissions_async] +// [END iam_v1_generated_iampolicyclient_testiampermissions_async] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java index 70921f8b0f..241d958b43 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicy/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicy_TestIamPermissions_sync] +// [START iam_v1_generated_iampolicyclient_testiampermissions_sync] import com.google.iam.v1.IAMPolicyClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -44,4 +44,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END iam_v1_generated_IAMPolicy_TestIamPermissions_sync] +// [END iam_v1_generated_iampolicyclient_testiampermissions_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java index f97670d70b..07c44e3f36 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_IAMPolicySettings_SetIamPolicy_sync] +// [START iam_v1_generated_iampolicysettings_setiampolicy_sync] import com.google.iam.v1.IAMPolicySettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncSetIamPolicy() throws Exception { IAMPolicySettings iAMPolicySettings = iAMPolicySettingsBuilder.build(); } } -// [END iam_v1_generated_IAMPolicySettings_SetIamPolicy_sync] +// [END iam_v1_generated_iampolicysettings_setiampolicy_sync] diff --git a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java index 326c24a6dc..5dcf9940db 100644 --- a/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/stub/iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.stub.samples; -// [START iam_v1_generated_IAMPolicyStubSettings_SetIamPolicy_sync] +// [START iam_v1_generated_iampolicystubsettings_setiampolicy_sync] import com.google.iam.v1.stub.IAMPolicyStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncSetIamPolicy() throws Exception { IAMPolicyStubSettings iAMPolicySettings = iAMPolicySettingsBuilder.build(); } } -// [END iam_v1_generated_IAMPolicyStubSettings_SetIamPolicy_sync] +// [END iam_v1_generated_iampolicystubsettings_setiampolicy_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java index 2768ea0ab8..4506eaea40 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/AsyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/AsyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_async] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_async] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java index 13ee008da3..a4cb98e355 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] import com.google.cloud.kms.v1.AsymmetricDecryptRequest; import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java index 402cbd4ecb..25770fcafc 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptCryptokeyversionnameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_CryptokeyversionnameBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -45,4 +45,4 @@ public static void syncAsymmetricDecryptCryptokeyversionnameBytestring() throws } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_CryptokeyversionnameBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_cryptokeyversionnamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java index 2e7e021dce..0803f0216b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricdecrypt/SyncAsymmetricDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_StringBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] import com.google.cloud.kms.v1.AsymmetricDecryptResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncAsymmetricDecryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricDecrypt_StringBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricdecrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java index 458da95d07..9a59555f7d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/AsyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/AsyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_async] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; @@ -59,4 +59,4 @@ public static void asyncAsymmetricSign() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_async] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java index 6d38dccafe..ebeb161bf2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSign.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSign.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] import com.google.cloud.kms.v1.AsymmetricSignRequest; import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void syncAsymmetricSign() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java index 2f3802533a..5c0d200a8b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignCryptokeyversionnameDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_CryptokeyversionnameDigest_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -44,4 +44,4 @@ public static void syncAsymmetricSignCryptokeyversionnameDigest() throws Excepti } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_CryptokeyversionnameDigest_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_cryptokeyversionnamedigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java index 905a71eb32..40d611a590 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/asymmetricsign/SyncAsymmetricSignStringDigest.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/asymmetricsign/SyncAsymmetricSignStringDigest.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_AsymmetricSign_StringDigest_sync] +// [START kms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] import com.google.cloud.kms.v1.AsymmetricSignResponse; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.Digest; @@ -45,4 +45,4 @@ public static void syncAsymmetricSignStringDigest() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_AsymmetricSign_StringDigest_sync] +// [END kms_v1_generated_keymanagementserviceclient_asymmetricsign_stringdigest_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java index c96d3a6bdf..1de0e707ce 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Create_SetCredentialsProvider_sync] +// [START kms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END cloudkms_v1_generated_KeyManagementService_Create_SetCredentialsProvider_sync] +// [END kms_v1_generated_keymanagementserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java index deb933fa8a..fd4fa817fb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Create_SetEndpoint_sync] +// [START kms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyManagementServiceSettings; import com.google.cloud.kms.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { KeyManagementServiceClient.create(keyManagementServiceSettings); } } -// [END cloudkms_v1_generated_KeyManagementService_Create_SetEndpoint_sync] +// [END kms_v1_generated_keymanagementserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java index 4ffbf58a50..b9b9bb1382 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/AsyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/AsyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_async] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_async] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java index ea9b536553..285434da3d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_sync] import com.google.cloud.kms.v1.CreateCryptoKeyRequest; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java index d8cec59da0..4d906ae061 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyKeyringnameStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_KeyringnameStringCryptokey_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyKeyringnameStringCryptokey() throws Except } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_KeyringnameStringCryptokey_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_keyringnamestringcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java index ba7eda7d35..38f84ebd43 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokey/SyncCreateCryptoKeyStringStringCryptokey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_StringStringCryptokey_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyStringStringCryptokey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKey_StringStringCryptokey_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokey_stringstringcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java index e4fe7cef5c..1637224885 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/AsyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncCreateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java index 3d5b68f74a..e57c816cb8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] import com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -47,4 +47,4 @@ public static void syncCreateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java index 6fa204a3da..a5685dbaaa 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_CryptokeynameCryptokeyversion_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionCryptokeynameCryptokeyversion() thr } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_CryptokeynameCryptokeyversion_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_cryptokeynamecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java index 5a64f18b00..1e9cb43287 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createcryptokeyversion/SyncCreateCryptoKeyVersionStringCryptokeyversion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_StringCryptokeyversion_sync] +// [START kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncCreateCryptoKeyVersionStringCryptokeyversion() throws Exc } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateCryptoKeyVersion_StringCryptokeyversion_sync] +// [END kms_v1_generated_keymanagementserviceclient_createcryptokeyversion_stringcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java index 458b666b2a..af34ae5fcd 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/AsyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/AsyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_async] +// [START kms_v1_generated_keymanagementserviceclient_createimportjob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncCreateImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_async] +// [END kms_v1_generated_keymanagementserviceclient_createimportjob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java index 10ac1fe7ee..fb1480df9a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_sync] +// [START kms_v1_generated_keymanagementserviceclient_createimportjob_sync] import com.google.cloud.kms.v1.CreateImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -46,4 +46,4 @@ public static void syncCreateImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_sync] +// [END kms_v1_generated_keymanagementserviceclient_createimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java index e25252b6a0..1d388ab264 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobKeyringnameStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_KeyringnameStringImportjob_sync] +// [START kms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobKeyringnameStringImportjob() throws Except } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_KeyringnameStringImportjob_sync] +// [END kms_v1_generated_keymanagementserviceclient_createimportjob_keyringnamestringimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java index 69d497e017..093b8799bd 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createimportjob/SyncCreateImportJobStringStringImportjob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createimportjob/SyncCreateImportJobStringStringImportjob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateImportJob_StringStringImportjob_sync] +// [START kms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -43,4 +43,4 @@ public static void syncCreateImportJobStringStringImportjob() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateImportJob_StringStringImportjob_sync] +// [END kms_v1_generated_keymanagementserviceclient_createimportjob_stringstringimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java index d39ca8f888..bfa237e476 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/AsyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/AsyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_async] +// [START kms_v1_generated_keymanagementserviceclient_createkeyring_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -50,4 +50,4 @@ public static void asyncCreateKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_async] +// [END kms_v1_generated_keymanagementserviceclient_createkeyring_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java index c58aa6961a..6979aa3e5c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_sync] +// [START kms_v1_generated_keymanagementserviceclient_createkeyring_sync] import com.google.cloud.kms.v1.CreateKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -46,4 +46,4 @@ public static void syncCreateKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_sync] +// [END kms_v1_generated_keymanagementserviceclient_createkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java index 46add0d8c9..74034647d6 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingLocationnameStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_LocationnameStringKeyring_sync] +// [START kms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingLocationnameStringKeyring() throws Exception } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_LocationnameStringKeyring_sync] +// [END kms_v1_generated_keymanagementserviceclient_createkeyring_locationnamestringkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java index 067e82288a..6f244ba46f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/createkeyring/SyncCreateKeyRingStringStringKeyring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/createkeyring/SyncCreateKeyRingStringStringKeyring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_CreateKeyRing_StringStringKeyring_sync] +// [START kms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncCreateKeyRingStringStringKeyring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_CreateKeyRing_StringStringKeyring_sync] +// [END kms_v1_generated_keymanagementserviceclient_createkeyring_stringstringkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java index 6a32d6f8e1..b8d04eb6f5 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/AsyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Decrypt_async] +// [START kms_v1_generated_keymanagementserviceclient_decrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; @@ -56,4 +56,4 @@ public static void asyncDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Decrypt_async] +// [END kms_v1_generated_keymanagementserviceclient_decrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java index dac8b2ca95..5bb90544fe 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Decrypt_sync] +// [START kms_v1_generated_keymanagementserviceclient_decrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptRequest; import com.google.cloud.kms.v1.DecryptResponse; @@ -52,4 +52,4 @@ public static void syncDecrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Decrypt_sync] +// [END kms_v1_generated_keymanagementserviceclient_decrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java index a2980791bd..2c9fe6d8c1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptCryptokeynameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptCryptokeynameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Decrypt_CryptokeynameBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptCryptokeynameBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Decrypt_CryptokeynameBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_decrypt_cryptokeynamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java index b94582483c..26b5088c7d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/decrypt/SyncDecryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/decrypt/SyncDecryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Decrypt_StringBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.DecryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDecryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Decrypt_StringBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_decrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java index 8a42b375c3..96b3f7c43b 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncDestroyCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java index c2bb7e68d4..7d14750ced 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncDestroyCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java index 560f768080..7480f39b2a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_Cryptokeyversionname_sync] +// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncDestroyCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_Cryptokeyversionname_sync] +// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java index 60880a6a3a..f7e3f573a7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/destroycryptokeyversion/SyncDestroyCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncDestroyCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_DestroyCryptoKeyVersion_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_destroycryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java index b31c045a11..670e3c2ecc 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/AsyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Encrypt_async] +// [START kms_v1_generated_keymanagementserviceclient_encrypt_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; @@ -56,4 +56,4 @@ public static void asyncEncrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Encrypt_async] +// [END kms_v1_generated_keymanagementserviceclient_encrypt_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java index 0c8fe72c44..2ede7ab4b1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncrypt.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncrypt.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Encrypt_sync] +// [START kms_v1_generated_keymanagementserviceclient_encrypt_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptRequest; import com.google.cloud.kms.v1.EncryptResponse; @@ -52,4 +52,4 @@ public static void syncEncrypt() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Encrypt_sync] +// [END kms_v1_generated_keymanagementserviceclient_encrypt_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java index 1b332fefc8..eb2dde9fd1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptResourcenameBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptResourcenameBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Encrypt_ResourcenameBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; @@ -43,4 +43,4 @@ public static void syncEncryptResourcenameBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Encrypt_ResourcenameBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_encrypt_resourcenamebytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java index 07762a2140..9cd6b9c0bb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/encrypt/SyncEncryptStringBytestring.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/encrypt/SyncEncryptStringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_Encrypt_StringBytestring_sync] +// [START kms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.EncryptResponse; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncEncryptStringBytestring() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_Encrypt_StringBytestring_sync] +// [END kms_v1_generated_keymanagementserviceclient_encrypt_stringbytestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java index 0a317395bc..11c9d9933f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/AsyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/AsyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_async] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -50,4 +50,4 @@ public static void asyncGetCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_async] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java index 5bc4d96d8a..cfe6c408e4 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.GetCryptoKeyRequest; @@ -46,4 +46,4 @@ public static void syncGetCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java index 9c07a8a3f9..80f310af0a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_Cryptokeyname_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyCryptokeyname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_Cryptokeyname_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java index 9216849d6b..1ae0e8f179 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokey/SyncGetCryptoKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokey/SyncGetCryptoKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKey_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetCryptoKeyString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKey_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokey_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java index bdc547e7bf..62243f3c20 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/AsyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/AsyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncGetCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java index 22ce91d55e..882fb75932 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetCryptoKeyVersionRequest; @@ -51,4 +51,4 @@ public static void syncGetCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java index 73aa2d577a..4e28c15fda 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_Cryptokeyversionname_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncGetCryptoKeyVersionCryptokeyversionname() throws Exceptio } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_Cryptokeyversionname_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java index 67abf494d5..febdb4a86d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getcryptokeyversion/SyncGetCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getcryptokeyversion/SyncGetCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncGetCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetCryptoKeyVersion_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_getcryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java index 93eb30dac0..50981d7822 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetIamPolicy_async] +// [START kms_v1_generated_keymanagementserviceclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetIamPolicy_async] +// [END kms_v1_generated_keymanagementserviceclient_getiampolicy_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java index 5e0bfa23da..c317351717 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetIamPolicy_sync] +// [START kms_v1_generated_keymanagementserviceclient_getiampolicy_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetIamPolicy_sync] +// [END kms_v1_generated_keymanagementserviceclient_getiampolicy_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java index bcad674dc7..15d8df664c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/AsyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/AsyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_async] +// [START kms_v1_generated_keymanagementserviceclient_getimportjob_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; @@ -50,4 +50,4 @@ public static void asyncGetImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_async] +// [END kms_v1_generated_keymanagementserviceclient_getimportjob_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java index 7cd02a81ea..c49b07bdab 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJob.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJob.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_sync] +// [START kms_v1_generated_keymanagementserviceclient_getimportjob_sync] import com.google.cloud.kms.v1.GetImportJobRequest; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; @@ -46,4 +46,4 @@ public static void syncGetImportJob() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_sync] +// [END kms_v1_generated_keymanagementserviceclient_getimportjob_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java index ec16718779..657528e659 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobImportjobname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobImportjobname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_Importjobname_sync] +// [START kms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobImportjobname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_Importjobname_sync] +// [END kms_v1_generated_keymanagementserviceclient_getimportjob_importjobname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java index ad8655ede8..0acbf4a953 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getimportjob/SyncGetImportJobString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getimportjob/SyncGetImportJobString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetImportJob_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.ImportJobName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -41,4 +41,4 @@ public static void syncGetImportJobString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetImportJob_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_getimportjob_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java index 59a16e8740..44393ca245 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/AsyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/AsyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_async] +// [START kms_v1_generated_keymanagementserviceclient_getkeyring_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -48,4 +48,4 @@ public static void asyncGetKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_async] +// [END kms_v1_generated_keymanagementserviceclient_getkeyring_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java index a880293179..7fda97b056 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_sync] +// [START kms_v1_generated_keymanagementserviceclient_getkeyring_sync] import com.google.cloud.kms.v1.GetKeyRingRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -44,4 +44,4 @@ public static void syncGetKeyRing() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_sync] +// [END kms_v1_generated_keymanagementserviceclient_getkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java index 5353772a9f..3c8487c8ec 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_Keyringname_sync] +// [START kms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_Keyringname_sync] +// [END kms_v1_generated_keymanagementserviceclient_getkeyring_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java index b6305c4ce7..22df9329c8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getkeyring/SyncGetKeyRingString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getkeyring/SyncGetKeyRingString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetKeyRing_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.KeyRingName; @@ -40,4 +40,4 @@ public static void syncGetKeyRingString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetKeyRing_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_getkeyring_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java index b496695cc2..e6a8eae9c9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/AsyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/AsyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetLocation_async] +// [START kms_v1_generated_keymanagementserviceclient_getlocation_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; @@ -44,4 +44,4 @@ public static void asyncGetLocation() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetLocation_async] +// [END kms_v1_generated_keymanagementserviceclient_getlocation_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java index 5972b43835..3899dffdee 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getlocation/SyncGetLocation.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getlocation/SyncGetLocation.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetLocation_sync] +// [START kms_v1_generated_keymanagementserviceclient_getlocation_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.GetLocationRequest; import com.google.cloud.location.Location; @@ -40,4 +40,4 @@ public static void syncGetLocation() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetLocation_sync] +// [END kms_v1_generated_keymanagementserviceclient_getlocation_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java index 1ba333176d..bb11933f3c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/AsyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/AsyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_async] +// [START kms_v1_generated_keymanagementserviceclient_getpublickey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; @@ -55,4 +55,4 @@ public static void asyncGetPublicKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_async] +// [END kms_v1_generated_keymanagementserviceclient_getpublickey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java index cd3d9e3e13..ec2082835e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_sync] +// [START kms_v1_generated_keymanagementserviceclient_getpublickey_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.GetPublicKeyRequest; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncGetPublicKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_sync] +// [END kms_v1_generated_keymanagementserviceclient_getpublickey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java index 933f9681ab..d9fc43d942 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_Cryptokeyversionname_sync] +// [START kms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -42,4 +42,4 @@ public static void syncGetPublicKeyCryptokeyversionname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_Cryptokeyversionname_sync] +// [END kms_v1_generated_keymanagementserviceclient_getpublickey_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java index 371d27f697..5f1593019e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/getpublickey/SyncGetPublicKeyString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/getpublickey/SyncGetPublicKeyString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_GetPublicKey_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.PublicKey; @@ -43,4 +43,4 @@ public static void syncGetPublicKeyString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_GetPublicKey_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_getpublickey_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java index 7325f636c0..6ee3e456bb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/AsyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/AsyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -51,4 +51,4 @@ public static void asyncImportCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java index e6c5a63a11..6125e803e9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/importcryptokeyversion/SyncImportCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/importcryptokeyversion/SyncImportCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.ImportCryptoKeyVersionRequest; @@ -47,4 +47,4 @@ public static void syncImportCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ImportCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_importcryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java index 6d8d539696..ecb63ab787 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_async] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListCryptoKeys() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_async] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java index 06b5ceb184..c4bd7828f1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/AsyncListCryptoKeysPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/AsyncListCryptoKeysPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Paged_async] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListCryptoKeysPaged() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Paged_async] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java index 1d4cacf80e..241c2db795 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeys.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListCryptoKeys() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java index 9f24627011..9e91cfc04c 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Keyringname_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_Keyringname_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java index b32726dab8..6ab2e2adfc 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeys/SyncListCryptoKeysString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeys/SyncListCryptoKeysString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListCryptoKeysString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeys_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeys_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java index 59182b4b2d..52567c2573 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_async] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; @@ -56,4 +56,4 @@ public static void asyncListCryptoKeyVersions() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_async] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java index ac7a2dd8a4..9546866879 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/AsyncListCryptoKeyVersionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Paged_async] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -64,4 +64,4 @@ public static void asyncListCryptoKeyVersionsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Paged_async] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java index 68a38385ca..88091292a8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -53,4 +53,4 @@ public static void syncListCryptoKeyVersions() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java index 0941b5c4d7..3652175240 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsCryptokeyname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Cryptokeyname_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsCryptokeyname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_Cryptokeyname_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_cryptokeyname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java index 6cd8fc6850..8d054c4967 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listcryptokeyversions/SyncListCryptoKeyVersionsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listcryptokeyversions/SyncListCryptoKeyVersionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -44,4 +44,4 @@ public static void syncListCryptoKeyVersionsString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListCryptoKeyVersions_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_listcryptokeyversions_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java index 192e034b1e..09385d58e1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_async] +// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -54,4 +54,4 @@ public static void asyncListImportJobs() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_async] +// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java index 59b6b51662..32131a1c56 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/AsyncListImportJobsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/AsyncListImportJobsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_Paged_async] +// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -62,4 +62,4 @@ public static void asyncListImportJobsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_Paged_async] +// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java index dfd76a428b..73e3363831 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobs.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobs.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_sync] +// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -50,4 +50,4 @@ public static void syncListImportJobs() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_sync] +// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java index 4500177df1..fa8fe3d794 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsKeyringname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsKeyringname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_Keyringname_sync] +// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsKeyringname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_Keyringname_sync] +// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_keyringname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java index 66d5957f30..36277c90f1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listimportjobs/SyncListImportJobsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listimportjobs/SyncListImportJobsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListImportJobs_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] import com.google.cloud.kms.v1.ImportJob; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRingName; @@ -42,4 +42,4 @@ public static void syncListImportJobsString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListImportJobs_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_listimportjobs_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java index 83d8701f1a..56a9cd3b95 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_async] +// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; @@ -54,4 +54,4 @@ public static void asyncListKeyRings() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_async] +// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java similarity index 94% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java index 381b2c92a0..287623a523 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/AsyncListKeyRingsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/AsyncListKeyRingsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_Paged_async] +// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -62,4 +62,4 @@ public static void asyncListKeyRingsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_Paged_async] +// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java index 732646f6e8..e8ffd8dca4 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRings.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRings.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_sync] +// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.ListKeyRingsRequest; @@ -50,4 +50,4 @@ public static void syncListKeyRings() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_sync] +// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java index 9a75758574..cec3765454 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsLocationname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_Locationname_sync] +// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsLocationname() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_Locationname_sync] +// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_locationname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java index 49ab833c61..5794db5339 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listkeyrings/SyncListKeyRingsString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listkeyrings/SyncListKeyRingsString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListKeyRings_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.KeyRing; import com.google.cloud.kms.v1.LocationName; @@ -42,4 +42,4 @@ public static void syncListKeyRingsString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListKeyRings_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_listkeyrings_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java index 7719410624..2f9a5676f1 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListLocations_async] +// [START kms_v1_generated_keymanagementserviceclient_listlocations_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; @@ -52,4 +52,4 @@ public static void asyncListLocations() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListLocations_async] +// [END kms_v1_generated_keymanagementserviceclient_listlocations_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java index c5ac23eeb3..28e03c81ed 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/AsyncListLocationsPaged.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/AsyncListLocationsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListLocations_Paged_async] +// [START kms_v1_generated_keymanagementserviceclient_listlocations_paged_async] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.ListLocationsResponse; @@ -60,4 +60,4 @@ public static void asyncListLocationsPaged() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListLocations_Paged_async] +// [END kms_v1_generated_keymanagementserviceclient_listlocations_paged_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java index c377381038..83d882829f 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/listlocations/SyncListLocations.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/listlocations/SyncListLocations.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_ListLocations_sync] +// [START kms_v1_generated_keymanagementserviceclient_listlocations_sync] import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.location.ListLocationsRequest; import com.google.cloud.location.Location; @@ -48,4 +48,4 @@ public static void syncListLocations() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_ListLocations_sync] +// [END kms_v1_generated_keymanagementserviceclient_listlocations_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java index 1bad87972d..3e44a4eee2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; @@ -55,4 +55,4 @@ public static void asyncRestoreCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java index 68b6ed6531..3b7b242f1d 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -51,4 +51,4 @@ public static void syncRestoreCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java index 986539cc01..6edc7d69aa 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionCryptokeyversionname.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_Cryptokeyversionname_sync] +// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -42,4 +42,4 @@ public static void syncRestoreCryptoKeyVersionCryptokeyversionname() throws Exce } } } -// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_Cryptokeyversionname_sync] +// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_cryptokeyversionname_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java similarity index 91% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java index fc372ed700..91bf17eccb 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/restorecryptokeyversion/SyncRestoreCryptoKeyVersionString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_String_sync] +// [START kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.CryptoKeyVersionName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncRestoreCryptoKeyVersionString() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_RestoreCryptoKeyVersion_String_sync] +// [END kms_v1_generated_keymanagementserviceclient_restorecryptokeyversion_string_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java index ac5a891597..b5a9a02d79 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_TestIamPermissions_async] +// [START kms_v1_generated_keymanagementserviceclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -52,4 +52,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_TestIamPermissions_async] +// [END kms_v1_generated_keymanagementserviceclient_testiampermissions_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java index 2394e3686b..ee169643d7 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_TestIamPermissions_sync] +// [START kms_v1_generated_keymanagementserviceclient_testiampermissions_sync] import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -48,4 +48,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_TestIamPermissions_sync] +// [END kms_v1_generated_keymanagementserviceclient_testiampermissions_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java index 3c70757f69..95168be1b8 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/AsyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/AsyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_async] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_async] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java index 19f8b75878..ef8e9cded2 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKey.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKey.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKey() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java index b61deebb66..b31a813a66 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokey/SyncUpdateCryptoKeyCryptokeyFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_CryptokeyFieldmask_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -41,4 +41,4 @@ public static void syncUpdateCryptoKeyCryptokeyFieldmask() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKey_CryptokeyFieldmask_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokey_cryptokeyfieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java index 5d1306e7f6..94399c8252 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/AsyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; @@ -51,4 +51,4 @@ public static void asyncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java index 91c10be799..0f7b570e0a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -47,4 +47,4 @@ public static void syncUpdateCryptoKeyPrimaryVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java index 302e5fa67b..ef854d7729 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_CryptokeynameString_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionCryptokeynameString() throws } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_CryptokeynameString_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_cryptokeynamestring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java similarity index 90% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java index 377b15c87f..aeebde50d0 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyprimaryversion/SyncUpdateCryptoKeyPrimaryVersionStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_StringString_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] import com.google.cloud.kms.v1.CryptoKey; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -43,4 +43,4 @@ public static void syncUpdateCryptoKeyPrimaryVersionStringString() throws Except } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyPrimaryVersion_StringString_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyprimaryversion_stringstring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java index 801687a7a6..acc9d43dec 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_async] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] import com.google.api.core.ApiFuture; import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; @@ -49,4 +49,4 @@ public static void asyncUpdateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_async] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_async] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java similarity index 92% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java index 20825bbf94..97a198efb9 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCryptoKeyVersion() throws Exception { } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java similarity index 89% rename from test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java rename to test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java index 3b54c8b97f..ed1aaf15bf 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservice/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementserviceclient/updatecryptokeyversion/SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_CryptokeyversionFieldmask_sync] +// [START kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] import com.google.cloud.kms.v1.CryptoKeyVersion; import com.google.cloud.kms.v1.KeyManagementServiceClient; import com.google.protobuf.FieldMask; @@ -42,4 +42,4 @@ public static void syncUpdateCryptoKeyVersionCryptokeyversionFieldmask() throws } } } -// [END cloudkms_v1_generated_KeyManagementService_UpdateCryptoKeyVersion_CryptokeyversionFieldmask_sync] +// [END kms_v1_generated_keymanagementserviceclient_updatecryptokeyversion_cryptokeyversionfieldmask_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java index 3a20509fde..1d3331dc8a 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/keymanagementservicesettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.samples; -// [START cloudkms_v1_generated_KeyManagementServiceSettings_GetKeyRing_sync] +// [START kms_v1_generated_keymanagementservicesettings_getkeyring_sync] import com.google.cloud.kms.v1.KeyManagementServiceSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END cloudkms_v1_generated_KeyManagementServiceSettings_GetKeyRing_sync] +// [END kms_v1_generated_keymanagementservicesettings_getkeyring_sync] diff --git a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java index 75547f5f7a..7baee4a57e 100644 --- a/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java +++ b/test/integration/goldens/kms/samples/snippets/generated/main/java/com/google/cloud/kms/v1/stub/keymanagementservicestubsettings/getkeyring/SyncGetKeyRing.java @@ -16,7 +16,7 @@ package com.google.cloud.kms.v1.stub.samples; -// [START cloudkms_v1_generated_KeyManagementServiceStubSettings_GetKeyRing_sync] +// [START kms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] import com.google.cloud.kms.v1.stub.KeyManagementServiceStubSettings; import java.time.Duration; @@ -47,4 +47,4 @@ public static void syncGetKeyRing() throws Exception { keyManagementServiceSettingsBuilder.build(); } } -// [END cloudkms_v1_generated_KeyManagementServiceStubSettings_GetKeyRing_sync] +// [END kms_v1_generated_keymanagementservicestubsettings_getkeyring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java index 0a449701a1..a0e8d8b883 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_Create_SetCredentialsProvider_sync] +// [START library_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END example_v1_generated_LibraryService_Create_SetCredentialsProvider_sync] +// [END library_v1_generated_libraryserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java index 1ed4230d03..014b409361 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_Create_SetEndpoint_sync] +// [START library_v1_generated_libraryserviceclient_create_setendpoint_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.cloud.example.library.v1.LibraryServiceSettings; import com.google.cloud.example.library.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { LibraryServiceClient libraryServiceClient = LibraryServiceClient.create(libraryServiceSettings); } } -// [END example_v1_generated_LibraryService_Create_SetEndpoint_sync] +// [END library_v1_generated_libraryserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java index d58d7c2ca5..19a3b5a765 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/AsyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/AsyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateBook_async] +// [START library_v1_generated_libraryserviceclient_createbook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncCreateBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateBook_async] +// [END library_v1_generated_libraryserviceclient_createbook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java index 206c7673f5..d75dfd0215 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateBook_sync] +// [START library_v1_generated_libraryserviceclient_createbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.CreateBookRequest; @@ -44,4 +44,4 @@ public static void syncCreateBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateBook_sync] +// [END library_v1_generated_libraryserviceclient_createbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java index 5cd834c754..bd3963e824 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookShelfnameBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookShelfnameBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateBook_ShelfnameBook_sync] +// [START library_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookShelfnameBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateBook_ShelfnameBook_sync] +// [END library_v1_generated_libraryserviceclient_createbook_shelfnamebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java index 97a22b457a..1c115d62ae 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createbook/SyncCreateBookStringBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createbook/SyncCreateBookStringBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateBook_StringBook_sync] +// [START library_v1_generated_libraryserviceclient_createbook_stringbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncCreateBookStringBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateBook_StringBook_sync] +// [END library_v1_generated_libraryserviceclient_createbook_stringbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java index a6707d3f05..1a0ed5ff87 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/AsyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/AsyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateShelf_async] +// [START library_v1_generated_libraryserviceclient_createshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; @@ -43,4 +43,4 @@ public static void asyncCreateShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateShelf_async] +// [END library_v1_generated_libraryserviceclient_createshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java index b1017b8894..41edfce737 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateShelf_sync] +// [START library_v1_generated_libraryserviceclient_createshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.CreateShelfRequest; import com.google.example.library.v1.Shelf; @@ -40,4 +40,4 @@ public static void syncCreateShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateShelf_sync] +// [END library_v1_generated_libraryserviceclient_createshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java index d594994378..554007f360 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/createshelf/SyncCreateShelfShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/createshelf/SyncCreateShelfShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_CreateShelf_Shelf_sync] +// [START library_v1_generated_libraryserviceclient_createshelf_shelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; @@ -38,4 +38,4 @@ public static void syncCreateShelfShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_CreateShelf_Shelf_sync] +// [END library_v1_generated_libraryserviceclient_createshelf_shelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java index 1402bdeb2b..2626b080c3 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/AsyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/AsyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteBook_async] +// [START library_v1_generated_libraryserviceclient_deletebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; @@ -46,4 +46,4 @@ public static void asyncDeleteBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteBook_async] +// [END library_v1_generated_libraryserviceclient_deletebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java index ce5f72f7d4..270c06e9cd 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteBook_sync] +// [START library_v1_generated_libraryserviceclient_deletebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.example.library.v1.DeleteBookRequest; @@ -43,4 +43,4 @@ public static void syncDeleteBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteBook_sync] +// [END library_v1_generated_libraryserviceclient_deletebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java index 4984014875..57bf605de1 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteBook_Bookname_sync] +// [START library_v1_generated_libraryserviceclient_deletebook_bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookBookname() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteBook_Bookname_sync] +// [END library_v1_generated_libraryserviceclient_deletebook_bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java index 2747919b8c..480c519b0c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deletebook/SyncDeleteBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deletebook/SyncDeleteBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteBook_String_sync] +// [START library_v1_generated_libraryserviceclient_deletebook_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.BookName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteBookString() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteBook_String_sync] +// [END library_v1_generated_libraryserviceclient_deletebook_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java index 00960baafe..f7379ff7ca 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/AsyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteShelf_async] +// [START library_v1_generated_libraryserviceclient_deleteshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; @@ -44,4 +44,4 @@ public static void asyncDeleteShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteShelf_async] +// [END library_v1_generated_libraryserviceclient_deleteshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java index 737844b638..8c9506ba9d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteShelf_sync] +// [START library_v1_generated_libraryserviceclient_deleteshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.DeleteShelfRequest; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncDeleteShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteShelf_sync] +// [END library_v1_generated_libraryserviceclient_deleteshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java index 5b9a49da88..68340f6c02 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteShelf_Shelfname_sync] +// [START library_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteShelf_Shelfname_sync] +// [END library_v1_generated_libraryserviceclient_deleteshelf_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java index 6a1bc22c88..0dad6e4eb5 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/deleteshelf/SyncDeleteShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/deleteshelf/SyncDeleteShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_DeleteShelf_String_sync] +// [START library_v1_generated_libraryserviceclient_deleteshelf_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ShelfName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteShelfString() throws Exception { } } } -// [END example_v1_generated_LibraryService_DeleteShelf_String_sync] +// [END library_v1_generated_libraryserviceclient_deleteshelf_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java index 19f18d0b29..1d3961fa67 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/AsyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/AsyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetBook_async] +// [START library_v1_generated_libraryserviceclient_getbook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -44,4 +44,4 @@ public static void asyncGetBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetBook_async] +// [END library_v1_generated_libraryserviceclient_getbook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java index 31858147ef..bf96bddbe8 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetBook_sync] +// [START library_v1_generated_libraryserviceclient_getbook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncGetBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetBook_sync] +// [END library_v1_generated_libraryserviceclient_getbook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java index 718395228e..513978ef3d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookBookname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookBookname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetBook_Bookname_sync] +// [START library_v1_generated_libraryserviceclient_getbook_bookname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookBookname() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetBook_Bookname_sync] +// [END library_v1_generated_libraryserviceclient_getbook_bookname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java index 5c7f398a5e..29fab8d271 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getbook/SyncGetBookString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getbook/SyncGetBookString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetBook_String_sync] +// [START library_v1_generated_libraryserviceclient_getbook_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -39,4 +39,4 @@ public static void syncGetBookString() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetBook_String_sync] +// [END library_v1_generated_libraryserviceclient_getbook_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java index 0d7d770f7c..30daacbbb8 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/AsyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/AsyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetShelf_async] +// [START library_v1_generated_libraryserviceclient_getshelf_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; @@ -44,4 +44,4 @@ public static void asyncGetShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetShelf_async] +// [END library_v1_generated_libraryserviceclient_getshelf_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java index b6ddbfd368..627164c577 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetShelf_sync] +// [START library_v1_generated_libraryserviceclient_getshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.GetShelfRequest; import com.google.example.library.v1.Shelf; @@ -41,4 +41,4 @@ public static void syncGetShelf() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetShelf_sync] +// [END library_v1_generated_libraryserviceclient_getshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java index 7d6955a5f7..7bb09b105d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetShelf_Shelfname_sync] +// [START library_v1_generated_libraryserviceclient_getshelf_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetShelf_Shelfname_sync] +// [END library_v1_generated_libraryserviceclient_getshelf_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java index 9f4e413306..2d176ba38d 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/getshelf/SyncGetShelfString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/getshelf/SyncGetShelfString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_GetShelf_String_sync] +// [START library_v1_generated_libraryserviceclient_getshelf_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -39,4 +39,4 @@ public static void syncGetShelfString() throws Exception { } } } -// [END example_v1_generated_LibraryService_GetShelf_String_sync] +// [END library_v1_generated_libraryserviceclient_getshelf_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java index b5b4237d8b..07aa0ce803 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListBooks_async] +// [START library_v1_generated_libraryserviceclient_listbooks_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -50,4 +50,4 @@ public static void asyncListBooks() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListBooks_async] +// [END library_v1_generated_libraryserviceclient_listbooks_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java similarity index 94% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java index 243f5c6525..b359f09db4 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/AsyncListBooksPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/AsyncListBooksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListBooks_Paged_async] +// [START library_v1_generated_libraryserviceclient_listbooks_paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.Book; @@ -58,4 +58,4 @@ public static void asyncListBooksPaged() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListBooks_Paged_async] +// [END library_v1_generated_libraryserviceclient_listbooks_paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java index 34a171a818..9a4c835c48 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooks.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooks.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListBooks_sync] +// [START library_v1_generated_libraryserviceclient_listbooks_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ListBooksRequest; @@ -47,4 +47,4 @@ public static void syncListBooks() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListBooks_sync] +// [END library_v1_generated_libraryserviceclient_listbooks_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java index fc80b4f278..5731838424 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListBooks_Shelfname_sync] +// [START library_v1_generated_libraryserviceclient_listbooks_shelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListBooks_Shelfname_sync] +// [END library_v1_generated_libraryserviceclient_listbooks_shelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java index e1b8889824..ac88e27f09 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listbooks/SyncListBooksString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listbooks/SyncListBooksString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListBooks_String_sync] +// [START library_v1_generated_libraryserviceclient_listbooks_string_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.ShelfName; @@ -41,4 +41,4 @@ public static void syncListBooksString() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListBooks_String_sync] +// [END library_v1_generated_libraryserviceclient_listbooks_string_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java index a211012179..42df784232 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListShelves_async] +// [START library_v1_generated_libraryserviceclient_listshelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; @@ -48,4 +48,4 @@ public static void asyncListShelves() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListShelves_async] +// [END library_v1_generated_libraryserviceclient_listshelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java index b4c6b47d3e..4dae54af84 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/AsyncListShelvesPaged.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/AsyncListShelvesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListShelves_Paged_async] +// [START library_v1_generated_libraryserviceclient_listshelves_paged_async] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.common.base.Strings; import com.google.example.library.v1.ListShelvesRequest; @@ -56,4 +56,4 @@ public static void asyncListShelvesPaged() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListShelves_Paged_async] +// [END library_v1_generated_libraryserviceclient_listshelves_paged_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java index 05a25be7c7..f9f890cf89 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/listshelves/SyncListShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/listshelves/SyncListShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_ListShelves_sync] +// [START library_v1_generated_libraryserviceclient_listshelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.ListShelvesRequest; import com.google.example.library.v1.Shelf; @@ -45,4 +45,4 @@ public static void syncListShelves() throws Exception { } } } -// [END example_v1_generated_LibraryService_ListShelves_sync] +// [END library_v1_generated_libraryserviceclient_listshelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java index c987d1f46a..9583775c40 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/AsyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/AsyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_async] +// [START library_v1_generated_libraryserviceclient_mergeshelves_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; @@ -47,4 +47,4 @@ public static void asyncMergeShelves() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_async] +// [END library_v1_generated_libraryserviceclient_mergeshelves_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java similarity index 92% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java index 789de5490d..10b6a726f0 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelves.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelves.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_sync] +// [START library_v1_generated_libraryserviceclient_mergeshelves_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.MergeShelvesRequest; import com.google.example.library.v1.Shelf; @@ -44,4 +44,4 @@ public static void syncMergeShelves() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_sync] +// [END library_v1_generated_libraryserviceclient_mergeshelves_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java index db19cd564f..27bfa0decb 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_ShelfnameShelfname_sync] +// [START library_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_ShelfnameShelfname_sync] +// [END library_v1_generated_libraryserviceclient_mergeshelves_shelfnameshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java index e0d1e6e92e..0d98e78383 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesShelfnameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesShelfnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_ShelfnameString_sync] +// [START library_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesShelfnameString() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_ShelfnameString_sync] +// [END library_v1_generated_libraryserviceclient_mergeshelves_shelfnamestring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java similarity index 90% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java index 069e1c53a9..d6592fb44c 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_StringShelfname_sync] +// [START library_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_StringShelfname_sync] +// [END library_v1_generated_libraryserviceclient_mergeshelves_stringshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java index a43b537dff..36dd500532 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/mergeshelves/SyncMergeShelvesStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/mergeshelves/SyncMergeShelvesStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MergeShelves_StringString_sync] +// [START library_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; @@ -40,4 +40,4 @@ public static void syncMergeShelvesStringString() throws Exception { } } } -// [END example_v1_generated_LibraryService_MergeShelves_StringString_sync] +// [END library_v1_generated_libraryserviceclient_mergeshelves_stringstring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java index d708cf7261..dac0502ba7 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/AsyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/AsyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_async] +// [START library_v1_generated_libraryserviceclient_movebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -48,4 +48,4 @@ public static void asyncMoveBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_async] +// [END library_v1_generated_libraryserviceclient_movebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java index f6550c13c4..48a42d5504 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_sync] +// [START library_v1_generated_libraryserviceclient_movebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -45,4 +45,4 @@ public static void syncMoveBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_sync] +// [END library_v1_generated_libraryserviceclient_movebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java index 99c1fd34f9..48eba8e822 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_BooknameShelfname_sync] +// [START library_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_BooknameShelfname_sync] +// [END library_v1_generated_libraryserviceclient_movebook_booknameshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java index c9054e654d..28ccd13155 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookBooknameString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookBooknameString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_BooknameString_sync] +// [START library_v1_generated_libraryserviceclient_movebook_booknamestring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookBooknameString() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_BooknameString_sync] +// [END library_v1_generated_libraryserviceclient_movebook_booknamestring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java index be18f93ee6..28be6cf5af 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringShelfname.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringShelfname.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_StringShelfname_sync] +// [START library_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringShelfname() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_StringShelfname_sync] +// [END library_v1_generated_libraryserviceclient_movebook_stringshelfname_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java index f138247526..90221d0f12 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/movebook/SyncMoveBookStringString.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/movebook/SyncMoveBookStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_MoveBook_StringString_sync] +// [START library_v1_generated_libraryserviceclient_movebook_stringstring_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.BookName; @@ -41,4 +41,4 @@ public static void syncMoveBookStringString() throws Exception { } } } -// [END example_v1_generated_LibraryService_MoveBook_StringString_sync] +// [END library_v1_generated_libraryserviceclient_movebook_stringstring_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java index f2d4c0b210..f25e8ecd8e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/AsyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/AsyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_UpdateBook_async] +// [START library_v1_generated_libraryserviceclient_updatebook_async] import com.google.api.core.ApiFuture; import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; @@ -47,4 +47,4 @@ public static void asyncUpdateBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_UpdateBook_async] +// [END library_v1_generated_libraryserviceclient_updatebook_async] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java similarity index 93% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java index cf7e3d0518..f1e77b9bde 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBook.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBook.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_UpdateBook_sync] +// [START library_v1_generated_libraryserviceclient_updatebook_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.example.library.v1.UpdateBookRequest; @@ -44,4 +44,4 @@ public static void syncUpdateBook() throws Exception { } } } -// [END example_v1_generated_LibraryService_UpdateBook_sync] +// [END library_v1_generated_libraryserviceclient_updatebook_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java similarity index 91% rename from test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java rename to test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java index d35550ea87..802cde859a 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservice/updatebook/SyncUpdateBookBookFieldmask.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryserviceclient/updatebook/SyncUpdateBookBookFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryService_UpdateBook_BookFieldmask_sync] +// [START library_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] import com.google.cloud.example.library.v1.LibraryServiceClient; import com.google.example.library.v1.Book; import com.google.protobuf.FieldMask; @@ -40,4 +40,4 @@ public static void syncUpdateBookBookFieldmask() throws Exception { } } } -// [END example_v1_generated_LibraryService_UpdateBook_BookFieldmask_sync] +// [END library_v1_generated_libraryserviceclient_updatebook_bookfieldmask_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java index f308ba1d66..4166702843 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/libraryservicesettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.samples; -// [START example_v1_generated_LibraryServiceSettings_CreateShelf_sync] +// [START library_v1_generated_libraryservicesettings_createshelf_sync] import com.google.cloud.example.library.v1.LibraryServiceSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END example_v1_generated_LibraryServiceSettings_CreateShelf_sync] +// [END library_v1_generated_libraryservicesettings_createshelf_sync] diff --git a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java index 0634f4ea7c..67041c148e 100644 --- a/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java +++ b/test/integration/goldens/library/samples/snippets/generated/main/java/com/google/cloud/example/library/v1/stub/libraryservicestubsettings/createshelf/SyncCreateShelf.java @@ -16,7 +16,7 @@ package com.google.cloud.example.library.v1.stub.samples; -// [START example_v1_generated_LibraryServiceStubSettings_CreateShelf_sync] +// [START library_v1_generated_libraryservicestubsettings_createshelf_sync] import com.google.cloud.example.library.v1.stub.LibraryServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateShelf() throws Exception { LibraryServiceStubSettings libraryServiceSettings = libraryServiceSettingsBuilder.build(); } } -// [END example_v1_generated_LibraryServiceStubSettings_CreateShelf_sync] +// [END library_v1_generated_libraryservicestubsettings_createshelf_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java index 0ede8778f3..f2f4066308 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_configclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_configclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java index 37429d4a67..afec2022d9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] +// [START logging_v2_generated_configclient_create_setendpoint_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] +// [END logging_v2_generated_configclient_create_setendpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java index 9f9c69a77d..9455e1f583 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateBucket_async] +// [START logging_v2_generated_configclient_createbucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; @@ -48,4 +48,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateBucket_async] +// [END logging_v2_generated_configclient_createbucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java index 5cc7bc15b2..44a2380e7f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateBucket_sync] +// [START logging_v2_generated_configclient_createbucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; import com.google.logging.v2.LocationName; @@ -45,4 +45,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateBucket_sync] +// [END logging_v2_generated_configclient_createbucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java index b196b21eaf..5a727225c7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/AsyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_async] +// [START logging_v2_generated_configclient_createexclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_async] +// [END logging_v2_generated_configclient_createexclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java index f2a6dce03c..3456f78c79 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java index 145ed771c3..40e27846f0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_billingaccountnamelogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionBillingaccountnameLogexclusion() throws Ex } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_billingaccountnamelogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java index 3d2be77d9d..dc1fabf988 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_foldernamelogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionFoldernameLogexclusion() throws Exception } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_foldernamelogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java index e4198831ce..c68db9bcd7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_organizationnamelogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionOrganizationnameLogexclusion() throws Exce } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_organizationnamelogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java index ef4e209480..c1e47a5a2d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_projectnamelogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionProjectnameLogexclusion() throws Exception } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_projectnamelogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java index 301ea7dcb3..87cf6e299d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createexclusion/SyncCreateExclusionStringLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] +// [START logging_v2_generated_configclient_createexclusion_stringlogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionStringLogexclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] +// [END logging_v2_generated_configclient_createexclusion_stringlogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java index 88e10b4b70..e03a879bff 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/AsyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_async] +// [START logging_v2_generated_configclient_createsink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_async] +// [END logging_v2_generated_configclient_createsink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java index 35e03311e3..fa2ad4fc9f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_sync] +// [START logging_v2_generated_configclient_createsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; import com.google.logging.v2.LogSink; @@ -45,4 +45,4 @@ public static void syncCreateSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_sync] +// [END logging_v2_generated_configclient_createsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java index 76950150a9..572a3098c3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkBillingaccountnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] +// [START logging_v2_generated_configclient_createsink_billingaccountnamelogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkBillingaccountnameLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] +// [END logging_v2_generated_configclient_createsink_billingaccountnamelogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java index 935f2132c8..582f363830 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkFoldernameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] +// [START logging_v2_generated_configclient_createsink_foldernamelogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkFoldernameLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] +// [END logging_v2_generated_configclient_createsink_foldernamelogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java index 428ae218be..c1398c0c1d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkOrganizationnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] +// [START logging_v2_generated_configclient_createsink_organizationnamelogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateSinkOrganizationnameLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] +// [END logging_v2_generated_configclient_createsink_organizationnamelogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java index f8bec0d167..280f8ec9e0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkProjectnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] +// [START logging_v2_generated_configclient_createsink_projectnamelogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkProjectnameLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] +// [END logging_v2_generated_configclient_createsink_projectnamelogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java index 1a840db162..7b89426a58 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createsink/SyncCreateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] +// [START logging_v2_generated_configclient_createsink_stringlogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] +// [END logging_v2_generated_configclient_createsink_stringlogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java index b762e49489..7d8fe181c4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/AsyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateView_async] +// [START logging_v2_generated_configclient_createview_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; @@ -47,4 +47,4 @@ public static void asyncCreateView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateView_async] +// [END logging_v2_generated_configclient_createview_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java index 5f5ef37cb6..3f256b822c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/createview/SyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_CreateView_sync] +// [START logging_v2_generated_configclient_createview_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; import com.google.logging.v2.LogView; @@ -44,4 +44,4 @@ public static void syncCreateView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_CreateView_sync] +// [END logging_v2_generated_configclient_createview_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java index 5c587bdefd..bfad9cc3ad 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_async] +// [START logging_v2_generated_configclient_deletebucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_async] +// [END logging_v2_generated_configclient_deletebucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java index d3aa6996c2..b17b55d73c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] +// [START logging_v2_generated_configclient_deletebucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; import com.google.logging.v2.LogBucketName; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] +// [END logging_v2_generated_configclient_deletebucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java index 506e711260..6f8071f018 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/AsyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] +// [START logging_v2_generated_configclient_deleteexclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] +// [END logging_v2_generated_configclient_deleteexclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java index eea1f9c310..b37027a8d7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] +// [START logging_v2_generated_configclient_deleteexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; import com.google.logging.v2.LogExclusionName; @@ -44,4 +44,4 @@ public static void syncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] +// [END logging_v2_generated_configclient_deleteexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java index cb6123be51..38770a232b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] +// [START logging_v2_generated_configclient_deleteexclusion_logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] +// [END logging_v2_generated_configclient_deleteexclusion_logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java index 701c940ef7..83491e1cb9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteexclusion/SyncDeleteExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] +// [START logging_v2_generated_configclient_deleteexclusion_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] +// [END logging_v2_generated_configclient_deleteexclusion_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java index 56a4d9dc1a..1f50e2f00a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/AsyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteSink_async] +// [START logging_v2_generated_configclient_deletesink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteSink_async] +// [END logging_v2_generated_configclient_deletesink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java index 19759e39ca..3f509965ad 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteSink_sync] +// [START logging_v2_generated_configclient_deletesink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; import com.google.logging.v2.LogSinkName; @@ -43,4 +43,4 @@ public static void syncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteSink_sync] +// [END logging_v2_generated_configclient_deletesink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java index eb9d8c45af..98b7d0132e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] +// [START logging_v2_generated_configclient_deletesink_logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] +// [END logging_v2_generated_configclient_deletesink_logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java index 19ccef5c23..b661f1dac6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deletesink/SyncDeleteSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] +// [START logging_v2_generated_configclient_deletesink_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] +// [END logging_v2_generated_configclient_deletesink_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java index 8b92bebeb7..7f6431c943 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/AsyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteView_async] +// [START logging_v2_generated_configclient_deleteview_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteView_async] +// [END logging_v2_generated_configclient_deleteview_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java index fe09d90db1..6b414f800d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/deleteview/SyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_DeleteView_sync] +// [START logging_v2_generated_configclient_deleteview_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; import com.google.logging.v2.LogViewName; @@ -46,4 +46,4 @@ public static void syncDeleteView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_DeleteView_sync] +// [END logging_v2_generated_configclient_deleteview_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java index 4e0599b144..6157506a15 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetBucket_async] +// [START logging_v2_generated_configclient_getbucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; @@ -48,4 +48,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetBucket_async] +// [END logging_v2_generated_configclient_getbucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java index 996d6d8d0a..289ecd07cf 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetBucket_sync] +// [START logging_v2_generated_configclient_getbucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; import com.google.logging.v2.LogBucket; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetBucket_sync] +// [END logging_v2_generated_configclient_getbucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java index ad161fa1cd..c5db5ddfa0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/AsyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] +// [START logging_v2_generated_configclient_getcmeksettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -46,4 +46,4 @@ public static void asyncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] +// [END logging_v2_generated_configclient_getcmeksettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java index d1cc6edb97..ff80e74e33 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getcmeksettings/SyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] +// [START logging_v2_generated_configclient_getcmeksettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.CmekSettingsName; @@ -43,4 +43,4 @@ public static void syncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] +// [END logging_v2_generated_configclient_getcmeksettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java index cd68cdbd23..05a03f2bfe 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/AsyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetExclusion_async] +// [START logging_v2_generated_configclient_getexclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetExclusion_async] +// [END logging_v2_generated_configclient_getexclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java index 02526a974e..2eb5d880d6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetExclusion_sync] +// [START logging_v2_generated_configclient_getexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetExclusion_sync] +// [END logging_v2_generated_configclient_getexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java index 7007f21027..3820286ea5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] +// [START logging_v2_generated_configclient_getexclusion_logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] +// [END logging_v2_generated_configclient_getexclusion_logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java index 9644892476..e67d873b5d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getexclusion/SyncGetExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] +// [START logging_v2_generated_configclient_getexclusion_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] +// [END logging_v2_generated_configclient_getexclusion_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java index 5741024009..423c78be9b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/AsyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetSink_async] +// [START logging_v2_generated_configclient_getsink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; @@ -46,4 +46,4 @@ public static void asyncGetSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetSink_async] +// [END logging_v2_generated_configclient_getsink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java index 5a204ee514..c29e05d6e3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetSink_sync] +// [START logging_v2_generated_configclient_getsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; import com.google.logging.v2.LogSink; @@ -43,4 +43,4 @@ public static void syncGetSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetSink_sync] +// [END logging_v2_generated_configclient_getsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java index 69624dd227..358e9b90b7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] +// [START logging_v2_generated_configclient_getsink_logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] +// [END logging_v2_generated_configclient_getsink_logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java index d60d3e89fa..24f09d1911 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getsink/SyncGetSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetSink_String_sync] +// [START logging_v2_generated_configclient_getsink_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetSink_String_sync] +// [END logging_v2_generated_configclient_getsink_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java index fca576b053..d86f2b1b20 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/AsyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetView_async] +// [START logging_v2_generated_configclient_getview_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; @@ -49,4 +49,4 @@ public static void asyncGetView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetView_async] +// [END logging_v2_generated_configclient_getview_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java index 6162982ac0..21b1c6a56d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/getview/SyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_GetView_sync] +// [START logging_v2_generated_configclient_getview_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncGetView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_GetView_sync] +// [END logging_v2_generated_configclient_getview_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java index 4a415a51e4..5cb0f97bfe 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_async] +// [START logging_v2_generated_configclient_listbuckets_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; @@ -50,4 +50,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_async] +// [END logging_v2_generated_configclient_listbuckets_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java index abd004d18a..fc067a503a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] +// [START logging_v2_generated_configclient_listbuckets_paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListBucketsRequest; @@ -58,4 +58,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] +// [END logging_v2_generated_configclient_listbuckets_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java index cced74307b..f9adc31ed0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_sync] +// [START logging_v2_generated_configclient_listbuckets_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; import com.google.logging.v2.LocationName; @@ -47,4 +47,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_sync] +// [END logging_v2_generated_configclient_listbuckets_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java index 210f92506a..fe18d0f88d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsBillingaccountlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] +// [START logging_v2_generated_configclient_listbuckets_billingaccountlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountLocationName; import com.google.logging.v2.LogBucket; @@ -42,4 +42,4 @@ public static void syncListBucketsBillingaccountlocationname() throws Exception } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] +// [END logging_v2_generated_configclient_listbuckets_billingaccountlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java index 9b964e318c..f0f250172e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsFolderlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] +// [START logging_v2_generated_configclient_listbuckets_folderlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderLocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsFolderlocationname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] +// [END logging_v2_generated_configclient_listbuckets_folderlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java index 6eb3c8dccb..b00f3902e7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] +// [START logging_v2_generated_configclient_listbuckets_locationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsLocationname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] +// [END logging_v2_generated_configclient_listbuckets_locationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java index a8c3d488b5..d5ceef258d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsOrganizationlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] +// [START logging_v2_generated_configclient_listbuckets_organizationlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.OrganizationLocationName; @@ -41,4 +41,4 @@ public static void syncListBucketsOrganizationlocationname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] +// [END logging_v2_generated_configclient_listbuckets_organizationlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java index e12f7e109d..a8148fe4f0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] +// [START logging_v2_generated_configclient_listbuckets_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] +// [END logging_v2_generated_configclient_listbuckets_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java index 9962b6b147..dec620d85c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_async] +// [START logging_v2_generated_configclient_listexclusions_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; @@ -51,4 +51,4 @@ public static void asyncListExclusions() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_async] +// [END logging_v2_generated_configclient_listexclusions_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java index 34a44b8418..bfe5d1fb3d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/AsyncListExclusionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] +// [START logging_v2_generated_configclient_listexclusions_paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListExclusionsRequest; @@ -58,4 +58,4 @@ public static void asyncListExclusionsPaged() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] +// [END logging_v2_generated_configclient_listexclusions_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java index 57efa08b83..c069af988b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_sync] +// [START logging_v2_generated_configclient_listexclusions_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; import com.google.logging.v2.LogExclusion; @@ -47,4 +47,4 @@ public static void syncListExclusions() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_sync] +// [END logging_v2_generated_configclient_listexclusions_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java index 053d366a89..e7ac9c19e1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] +// [START logging_v2_generated_configclient_listexclusions_billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] +// [END logging_v2_generated_configclient_listexclusions_billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java index e9a73d3f4f..4c2f70e3e6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] +// [START logging_v2_generated_configclient_listexclusions_foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsFoldername() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] +// [END logging_v2_generated_configclient_listexclusions_foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java index db670ab3e1..06ff515d5d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] +// [START logging_v2_generated_configclient_listexclusions_organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListExclusionsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] +// [END logging_v2_generated_configclient_listexclusions_organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java index 27142979e0..a71c637173 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] +// [START logging_v2_generated_configclient_listexclusions_projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsProjectname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] +// [END logging_v2_generated_configclient_listexclusions_projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java index 6f2889389b..780159346c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listexclusions/SyncListExclusionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] +// [START logging_v2_generated_configclient_listexclusions_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] +// [END logging_v2_generated_configclient_listexclusions_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java index bab6ac1100..46a682b0c0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_async] +// [START logging_v2_generated_configclient_listsinks_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; @@ -50,4 +50,4 @@ public static void asyncListSinks() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_async] +// [END logging_v2_generated_configclient_listsinks_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java index 8221ed0e47..93d3ff719c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/AsyncListSinksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] +// [START logging_v2_generated_configclient_listsinks_paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListSinksRequest; @@ -58,4 +58,4 @@ public static void asyncListSinksPaged() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] +// [END logging_v2_generated_configclient_listsinks_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java index 665b6f1e39..64d444f784 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_sync] +// [START logging_v2_generated_configclient_listsinks_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; import com.google.logging.v2.LogSink; @@ -47,4 +47,4 @@ public static void syncListSinks() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_sync] +// [END logging_v2_generated_configclient_listsinks_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java index 41c8f681ef..c0dde5f359 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] +// [START logging_v2_generated_configclient_listsinks_billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] +// [END logging_v2_generated_configclient_listsinks_billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java index 2b7d35ab97..797aa9ab66 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] +// [START logging_v2_generated_configclient_listsinks_foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksFoldername() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] +// [END logging_v2_generated_configclient_listsinks_foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java index 264990af48..a6f77fb803 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] +// [START logging_v2_generated_configclient_listsinks_organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListSinksOrganizationname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] +// [END logging_v2_generated_configclient_listsinks_organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java index e44b6205ca..345a523d78 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] +// [START logging_v2_generated_configclient_listsinks_projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksProjectname() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] +// [END logging_v2_generated_configclient_listsinks_projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java index 52585a2f61..be0f4d5962 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listsinks/SyncListSinksString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] +// [START logging_v2_generated_configclient_listsinks_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] +// [END logging_v2_generated_configclient_listsinks_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java index 2f50413e92..d864049690 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListViews_async] +// [START logging_v2_generated_configclient_listviews_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; @@ -49,4 +49,4 @@ public static void asyncListViews() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListViews_async] +// [END logging_v2_generated_configclient_listviews_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java index c11f0129e6..1128e0c953 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/AsyncListViewsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] +// [START logging_v2_generated_configclient_listviews_paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListViewsRequest; @@ -57,4 +57,4 @@ public static void asyncListViewsPaged() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] +// [END logging_v2_generated_configclient_listviews_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java index b47aa44bce..952e9a693b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListViews_sync] +// [START logging_v2_generated_configclient_listviews_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncListViews() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListViews_sync] +// [END logging_v2_generated_configclient_listviews_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java index e4375e0440..8823b13a83 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/listviews/SyncListViewsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_ListViews_String_sync] +// [START logging_v2_generated_configclient_listviews_string_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -40,4 +40,4 @@ public static void syncListViewsString() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_ListViews_String_sync] +// [END logging_v2_generated_configclient_listviews_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java index bbc765fad4..3ce4cbddee 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/AsyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] +// [START logging_v2_generated_configclient_undeletebucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void asyncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] +// [END logging_v2_generated_configclient_undeletebucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java index a701841e37..084e5535f4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/undeletebucket/SyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] +// [START logging_v2_generated_configclient_undeletebucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; import com.google.logging.v2.UndeleteBucketRequest; @@ -45,4 +45,4 @@ public static void syncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] +// [END logging_v2_generated_configclient_undeletebucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java index 3b41eca05a..0f0c1b04be 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_async] +// [START logging_v2_generated_configclient_updatebucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; @@ -51,4 +51,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_async] +// [END logging_v2_generated_configclient_updatebucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java index a869306187..dc2a527241 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] +// [START logging_v2_generated_configclient_updatebucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] +// [END logging_v2_generated_configclient_updatebucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java index fd173d5072..7dbb0368ce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/AsyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] +// [START logging_v2_generated_configclient_updatecmeksettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -49,4 +49,4 @@ public static void asyncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] +// [END logging_v2_generated_configclient_updatecmeksettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java index f0c7feb985..d3792e3208 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatecmeksettings/SyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] +// [START logging_v2_generated_configclient_updatecmeksettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.UpdateCmekSettingsRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] +// [END logging_v2_generated_configclient_updatecmeksettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java index 7b24e77c6f..e55d0d0fe9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/AsyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] +// [START logging_v2_generated_configclient_updateexclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; @@ -50,4 +50,4 @@ public static void asyncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] +// [END logging_v2_generated_configclient_updateexclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java index 5599414833..1db3dc488a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] +// [START logging_v2_generated_configclient_updateexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -47,4 +47,4 @@ public static void syncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] +// [END logging_v2_generated_configclient_updateexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java index bc402ea94c..78a1e5a986 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [START logging_v2_generated_configclient_updateexclusion_logexclusionnamelogexclusionfieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionLogexclusionnameLogexclusionFieldmask() th } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [END logging_v2_generated_configclient_updateexclusion_logexclusionnamelogexclusionfieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java index 8e20f45a0b..75c16f8cae 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [START logging_v2_generated_configclient_updateexclusion_stringlogexclusionfieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionStringLogexclusionFieldmask() throws Excep } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [END logging_v2_generated_configclient_updateexclusion_stringlogexclusionfieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java index e4d5c91e85..7fcf0bdf1c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/AsyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_async] +// [START logging_v2_generated_configclient_updatesink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; @@ -50,4 +50,4 @@ public static void asyncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_async] +// [END logging_v2_generated_configclient_updatesink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java index af470dcb04..7c8807c8af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_sync] +// [START logging_v2_generated_configclient_updatesink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -47,4 +47,4 @@ public static void syncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_sync] +// [END logging_v2_generated_configclient_updatesink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java index f74d2c33de..78a81f8937 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] +// [START logging_v2_generated_configclient_updatesink_logsinknamelogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkLogsinknameLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] +// [END logging_v2_generated_configclient_updatesink_logsinknamelogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java index aec9fbcd1f..e06b9c774c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [START logging_v2_generated_configclient_updatesink_logsinknamelogsinkfieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkLogsinknameLogsinkFieldmask() throws Exception } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [END logging_v2_generated_configclient_updatesink_logsinknamelogsinkfieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java index 902dc0926a..86cc0f5b95 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] +// [START logging_v2_generated_configclient_updatesink_stringlogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] +// [END logging_v2_generated_configclient_updatesink_stringlogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java index ff275027c0..b7f8f65122 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] +// [START logging_v2_generated_configclient_updatesink_stringlogsinkfieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkStringLogsinkFieldmask() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] +// [END logging_v2_generated_configclient_updatesink_stringlogsinkfieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java index 15c5e06efe..3f0daf24c3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/AsyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateView_async] +// [START logging_v2_generated_configclient_updateview_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -48,4 +48,4 @@ public static void asyncUpdateView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateView_async] +// [END logging_v2_generated_configclient_updateview_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java index fbe179a735..d1d3117133 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configclient/updateview/SyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigServiceV2_UpdateView_sync] +// [START logging_v2_generated_configclient_updateview_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; import com.google.logging.v2.UpdateViewRequest; @@ -45,4 +45,4 @@ public static void syncUpdateView() throws Exception { } } } -// [END logging_v2_generated_ConfigServiceV2_UpdateView_sync] +// [END logging_v2_generated_configclient_updateview_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java index 4ce5011311..53cfac1f8f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configsettings/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_ConfigSettings_GetBucket_sync] +// [START logging_v2_generated_configsettings_getbucket_sync] import com.google.cloud.logging.v2.ConfigSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { ConfigSettings configSettings = configSettingsBuilder.build(); } } -// [END logging_v2_generated_ConfigSettings_GetBucket_sync] +// [END logging_v2_generated_configsettings_getbucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java index e816fa00c0..1e0aca6062 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_loggingclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_loggingclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java index 8f45174e6d..22c45b6a90 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] +// [START logging_v2_generated_loggingclient_create_setendpoint_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] +// [END logging_v2_generated_loggingclient_create_setendpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java index ddfc69170c..0c04352731 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/AsyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_DeleteLog_async] +// [START logging_v2_generated_loggingclient_deletelog_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_DeleteLog_async] +// [END logging_v2_generated_loggingclient_deletelog_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java index 0f4b8d4815..92d383e7cb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_DeleteLog_sync] +// [START logging_v2_generated_loggingclient_deletelog_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.LogName; @@ -43,4 +43,4 @@ public static void syncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_DeleteLog_sync] +// [END logging_v2_generated_loggingclient_deletelog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java index 58768449fc..6a76c31d20 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogLogname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] +// [START logging_v2_generated_loggingclient_deletelog_logname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogLogname() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] +// [END logging_v2_generated_loggingclient_deletelog_logname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java index 6322f88684..65d291b1bc 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/deletelog/SyncDeleteLogString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] +// [START logging_v2_generated_loggingclient_deletelog_string_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogString() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] +// [END logging_v2_generated_loggingclient_deletelog_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java index 882c03d6ad..c169336b22 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_async] +// [START logging_v2_generated_loggingclient_listlogentries_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_async] +// [END logging_v2_generated_loggingclient_listlogentries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java index f018b6932d..311f40bbd9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/AsyncListLogEntriesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] +// [START logging_v2_generated_loggingclient_listlogentries_paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogEntriesRequest; @@ -60,4 +60,4 @@ public static void asyncListLogEntriesPaged() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] +// [END logging_v2_generated_loggingclient_listlogentries_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java index 0809ee3bae..e8b582e400 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] +// [START logging_v2_generated_loggingclient_listlogentries_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; import com.google.logging.v2.LogEntry; @@ -49,4 +49,4 @@ public static void syncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] +// [END logging_v2_generated_loggingclient_listlogentries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java index 0362f54077..1bcaaf470e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogentries/SyncListLogEntriesListstringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] +// [START logging_v2_generated_loggingclient_listlogentries_liststringstringstring_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncListLogEntriesListstringStringString() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] +// [END logging_v2_generated_loggingclient_listlogentries_liststringstringstring_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java index f953d535ba..bc7e1709c3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_async] +// [START logging_v2_generated_loggingclient_listlogs_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; @@ -51,4 +51,4 @@ public static void asyncListLogs() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_async] +// [END logging_v2_generated_loggingclient_listlogs_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java index 8f1861dbc7..18e4bd70d9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/AsyncListLogsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] +// [START logging_v2_generated_loggingclient_listlogs_paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogsRequest; @@ -59,4 +59,4 @@ public static void asyncListLogsPaged() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] +// [END logging_v2_generated_loggingclient_listlogs_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java index c3f2710ac0..141b91f95f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_sync] +// [START logging_v2_generated_loggingclient_listlogs_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; import com.google.logging.v2.ProjectName; @@ -48,4 +48,4 @@ public static void syncListLogs() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_sync] +// [END logging_v2_generated_loggingclient_listlogs_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java index 873f35192b..ca034d54fb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] +// [START logging_v2_generated_loggingclient_listlogs_billingaccountname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.BillingAccountName; @@ -40,4 +40,4 @@ public static void syncListLogsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] +// [END logging_v2_generated_loggingclient_listlogs_billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java index 21f7c3d8f1..07aec77925 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] +// [START logging_v2_generated_loggingclient_listlogs_foldername_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.FolderName; @@ -40,4 +40,4 @@ public static void syncListLogsFoldername() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] +// [END logging_v2_generated_loggingclient_listlogs_foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java index 482880b0ea..ac63a26b68 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] +// [START logging_v2_generated_loggingclient_listlogs_organizationname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncListLogsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] +// [END logging_v2_generated_loggingclient_listlogs_organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java index 56ae4bede8..4ce1d9fe0b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] +// [START logging_v2_generated_loggingclient_listlogs_projectname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsProjectname() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] +// [END logging_v2_generated_loggingclient_listlogs_projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java index 72be8ea87b..99b9cb3437 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listlogs/SyncListLogsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] +// [START logging_v2_generated_loggingclient_listlogs_string_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsString() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] +// [END logging_v2_generated_loggingclient_listlogs_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java index 7280fad4e7..a24c719686 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] +// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_async] import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -49,4 +49,4 @@ public static void asyncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] +// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java index cfc6c077af..389ac1437d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] +// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_paged_async] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; @@ -57,4 +57,4 @@ public static void asyncListMonitoredResourceDescriptorsPaged() throws Exception } } } -// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] +// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java index 14cc45dc9c..10f2bd95d2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] +// [START logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_sync] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest; @@ -46,4 +46,4 @@ public static void syncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] +// [END logging_v2_generated_loggingclient_listmonitoredresourcedescriptors_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java index cc2ea957f7..11ad1e4b8a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/taillogentries/AsyncTailLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_TailLogEntries_async] +// [START logging_v2_generated_loggingclient_taillogentries_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.TailLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncTailLogEntries() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_TailLogEntries_async] +// [END logging_v2_generated_loggingclient_taillogentries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java index 35a3265911..9669ae5aa9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/AsyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] +// [START logging_v2_generated_loggingclient_writelogentries_async] import com.google.api.MonitoredResource; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -56,4 +56,4 @@ public static void asyncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] +// [END logging_v2_generated_loggingclient_writelogentries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java index 8d0b01bf25..034a50c322 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] +// [START logging_v2_generated_loggingclient_writelogentries_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -52,4 +52,4 @@ public static void syncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] +// [END logging_v2_generated_loggingclient_writelogentries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java index bd79f3dd2e..b122e0ca59 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_loggingclient_writelogentries_lognamemonitoredresourcemapstringstringlistlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesLognameMonitoredresourceMapstringstringLis } } } -// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_loggingclient_writelogentries_lognamemonitoredresourcemapstringstringlistlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java index 830f5c9594..90432747f1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingclient/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_loggingclient_writelogentries_stringmonitoredresourcemapstringstringlistlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesStringMonitoredresourceMapstringstringList } } } -// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_loggingclient_writelogentries_stringmonitoredresourcemapstringstringlistlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java index 11841688ba..0eeb1e8ec1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingsettings/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_LoggingSettings_DeleteLog_sync] +// [START logging_v2_generated_loggingsettings_deletelog_sync] import com.google.cloud.logging.v2.LoggingSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteLog() throws Exception { LoggingSettings loggingSettings = loggingSettingsBuilder.build(); } } -// [END logging_v2_generated_LoggingSettings_DeleteLog_sync] +// [END logging_v2_generated_loggingsettings_deletelog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java index 01738692f9..4a7fad7c9c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_metricsclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_metricsclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java index 34cf57f15c..f619e9fcd8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] +// [START logging_v2_generated_metricsclient_create_setendpoint_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] +// [END logging_v2_generated_metricsclient_create_setendpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java index 4de99d41be..4bd3ba3186 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/AsyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] +// [START logging_v2_generated_metricsclient_createlogmetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; @@ -47,4 +47,4 @@ public static void asyncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] +// [END logging_v2_generated_metricsclient_createlogmetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java index 1d7b15926b..a88b849b70 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] +// [START logging_v2_generated_metricsclient_createlogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -44,4 +44,4 @@ public static void syncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] +// [END logging_v2_generated_metricsclient_createlogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java index a6b645e580..abe243b3ce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] +// [START logging_v2_generated_metricsclient_createlogmetric_projectnamelogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricProjectnameLogmetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] +// [END logging_v2_generated_metricsclient_createlogmetric_projectnamelogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java index 55f0d05910..7c6ae95efa 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/createlogmetric/SyncCreateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_metricsclient_createlogmetric_stringlogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_metricsclient_createlogmetric_stringlogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java index 9eaddcee33..aeaaa68a98 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/AsyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] +// [START logging_v2_generated_metricsclient_deletelogmetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] +// [END logging_v2_generated_metricsclient_deletelogmetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java index a0af69c351..246790429f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] +// [START logging_v2_generated_metricsclient_deletelogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; import com.google.logging.v2.LogMetricName; @@ -43,4 +43,4 @@ public static void syncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] +// [END logging_v2_generated_metricsclient_deletelogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java index 033de053ff..46b6b255ff 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] +// [START logging_v2_generated_metricsclient_deletelogmetric_logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] +// [END logging_v2_generated_metricsclient_deletelogmetric_logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java index 69d8ab2df7..8cb923cf77 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/deletelogmetric/SyncDeleteLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] +// [START logging_v2_generated_metricsclient_deletelogmetric_string_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricString() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] +// [END logging_v2_generated_metricsclient_deletelogmetric_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java index 8bc22db42e..b7db353cf2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/AsyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_async] +// [START logging_v2_generated_metricsclient_getlogmetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_async] +// [END logging_v2_generated_metricsclient_getlogmetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java index c3054b8c91..a9970e2b40 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] +// [START logging_v2_generated_metricsclient_getlogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -43,4 +43,4 @@ public static void syncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] +// [END logging_v2_generated_metricsclient_getlogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java index be1612c929..d2c15e1c46 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] +// [START logging_v2_generated_metricsclient_getlogmetric_logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] +// [END logging_v2_generated_metricsclient_getlogmetric_logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java index 8d28e37eb5..da9854a0df 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/getlogmetric/SyncGetLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] +// [START logging_v2_generated_metricsclient_getlogmetric_string_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricString() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] +// [END logging_v2_generated_metricsclient_getlogmetric_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java index 517656c0ec..27a380cec9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] +// [START logging_v2_generated_metricsclient_listlogmetrics_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; @@ -50,4 +50,4 @@ public static void asyncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] +// [END logging_v2_generated_metricsclient_listlogmetrics_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java index 1cc0315ef1..2d9de6a783 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/AsyncListLogMetricsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] +// [START logging_v2_generated_metricsclient_listlogmetrics_paged_async] import com.google.cloud.logging.v2.MetricsClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogMetricsRequest; @@ -58,4 +58,4 @@ public static void asyncListLogMetricsPaged() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] +// [END logging_v2_generated_metricsclient_listlogmetrics_paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java index d32b3af8e1..2ac1b067e8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] +// [START logging_v2_generated_metricsclient_listlogmetrics_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void syncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] +// [END logging_v2_generated_metricsclient_listlogmetrics_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java index f9da7ecb78..cf6269ed8a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] +// [START logging_v2_generated_metricsclient_listlogmetrics_projectname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsProjectname() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] +// [END logging_v2_generated_metricsclient_listlogmetrics_projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java index a3e327bf56..9ed1d30246 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/listlogmetrics/SyncListLogMetricsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] +// [START logging_v2_generated_metricsclient_listlogmetrics_string_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsString() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] +// [END logging_v2_generated_metricsclient_listlogmetrics_string_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java index d2c0ac2d2f..f7b38ecde5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/AsyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] +// [START logging_v2_generated_metricsclient_updatelogmetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void asyncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] +// [END logging_v2_generated_metricsclient_updatelogmetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java index dd2f105604..3130ade661 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] +// [START logging_v2_generated_metricsclient_updatelogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -44,4 +44,4 @@ public static void syncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] +// [END logging_v2_generated_metricsclient_updatelogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java index 656195a4f8..350e4dedc8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [START logging_v2_generated_metricsclient_updatelogmetric_logmetricnamelogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricLogmetricnameLogmetric() throws Exception } } } -// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [END logging_v2_generated_metricsclient_updatelogmetric_logmetricnamelogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java index c3a8f822d2..ef975ac05c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsclient/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_metricsclient_updatelogmetric_stringlogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_metricsclient_updatelogmetric_stringlogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java index 7827c8c0a8..8d790e3197 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricssettings/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_MetricsSettings_GetLogMetric_sync] +// [START logging_v2_generated_metricssettings_getlogmetric_sync] import com.google.cloud.logging.v2.MetricsSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetLogMetric() throws Exception { MetricsSettings metricsSettings = metricsSettingsBuilder.build(); } } -// [END logging_v2_generated_MetricsSettings_GetLogMetric_sync] +// [END logging_v2_generated_metricssettings_getlogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java index cf43da01a2..bb2b8d8ed7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/configservicev2stubsettings/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_ConfigServiceV2StubSettings_GetBucket_sync] +// [START logging_v2_generated_configservicev2stubsettings_getbucket_sync] import com.google.cloud.logging.v2.stub.ConfigServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGetBucket() throws Exception { ConfigServiceV2StubSettings configSettings = configSettingsBuilder.build(); } } -// [END logging_v2_generated_ConfigServiceV2StubSettings_GetBucket_sync] +// [END logging_v2_generated_configservicev2stubsettings_getbucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java index 9dbb84f39f..c9ea0e0fe6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/loggingservicev2stubsettings/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_LoggingServiceV2StubSettings_DeleteLog_sync] +// [START logging_v2_generated_loggingservicev2stubsettings_deletelog_sync] import com.google.cloud.logging.v2.stub.LoggingServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncDeleteLog() throws Exception { LoggingServiceV2StubSettings loggingSettings = loggingSettingsBuilder.build(); } } -// [END logging_v2_generated_LoggingServiceV2StubSettings_DeleteLog_sync] +// [END logging_v2_generated_loggingservicev2stubsettings_deletelog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java index be68fa6143..ef0eed0257 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/stub/metricsservicev2stubsettings/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.stub.samples; -// [START logging_v2_generated_MetricsServiceV2StubSettings_GetLogMetric_sync] +// [START logging_v2_generated_metricsservicev2stubsettings_getlogmetric_sync] import com.google.cloud.logging.v2.stub.MetricsServiceV2StubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncGetLogMetric() throws Exception { MetricsServiceV2StubSettings metricsSettings = metricsSettingsBuilder.build(); } } -// [END logging_v2_generated_MetricsServiceV2StubSettings_GetLogMetric_sync] +// [END logging_v2_generated_metricsservicev2stubsettings_getlogmetric_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java index f66d3eb280..8d6ba7006e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_schemaserviceclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.cloud.pubsub.v1.SchemaServiceSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings); } } -// [END pubsub_v1_generated_SchemaService_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_schemaserviceclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java index 6fef477696..64b754ef54 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_schemaserviceclient_create_setendpoint_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.cloud.pubsub.v1.SchemaServiceSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings); } } -// [END pubsub_v1_generated_SchemaService_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_schemaserviceclient_create_setendpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java index 8177b54efe..faf8677a74 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/AsyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/AsyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_CreateSchema_async] +// [START pubsub_v1_generated_schemaserviceclient_createschema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.CreateSchemaRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_CreateSchema_async] +// [END pubsub_v1_generated_schemaserviceclient_createschema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java index 6318c403b5..eb04b75b15 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_CreateSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_createschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.CreateSchemaRequest; import com.google.pubsub.v1.ProjectName; @@ -45,4 +45,4 @@ public static void syncCreateSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_CreateSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_createschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java index 63d1ec61c0..9aa8f43218 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaProjectnameSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaProjectnameSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_CreateSchema_ProjectnameSchemaString_sync] +// [START pubsub_v1_generated_schemaserviceclient_createschema_projectnameschemastring_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncCreateSchemaProjectnameSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_CreateSchema_ProjectnameSchemaString_sync] +// [END pubsub_v1_generated_schemaserviceclient_createschema_projectnameschemastring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java index e1e42c77df..8fd4669d1e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/createschema/SyncCreateSchemaStringSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/createschema/SyncCreateSchemaStringSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_CreateSchema_StringSchemaString_sync] +// [START pubsub_v1_generated_schemaserviceclient_createschema_stringschemastring_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncCreateSchemaStringSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_CreateSchema_StringSchemaString_sync] +// [END pubsub_v1_generated_schemaserviceclient_createschema_stringschemastring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java index e278448b05..07b999d269 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/AsyncDeleteSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/AsyncDeleteSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_DeleteSchema_async] +// [START pubsub_v1_generated_schemaserviceclient_deleteschema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_DeleteSchema_async] +// [END pubsub_v1_generated_schemaserviceclient_deleteschema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java index b7e421a8a8..04ee5a3078 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_DeleteSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_deleteschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSchemaRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_DeleteSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_deleteschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java index af400a0849..600c71d0e5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaSchemaname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaSchemaname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_DeleteSchema_Schemaname_sync] +// [START pubsub_v1_generated_schemaserviceclient_deleteschema_schemaname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncDeleteSchemaSchemaname() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_DeleteSchema_Schemaname_sync] +// [END pubsub_v1_generated_schemaserviceclient_deleteschema_schemaname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java index 52af2a9a27..59d1983e02 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/deleteschema/SyncDeleteSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/deleteschema/SyncDeleteSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_DeleteSchema_String_sync] +// [START pubsub_v1_generated_schemaserviceclient_deleteschema_string_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncDeleteSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_DeleteSchema_String_sync] +// [END pubsub_v1_generated_schemaserviceclient_deleteschema_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java index 17b5095bd3..89eee40dc0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetIamPolicy_async] +// [START pubsub_v1_generated_schemaserviceclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetIamPolicy_async] +// [END pubsub_v1_generated_schemaserviceclient_getiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java index 9490015035..a479793be6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetIamPolicy_sync] +// [START pubsub_v1_generated_schemaserviceclient_getiampolicy_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetIamPolicy_sync] +// [END pubsub_v1_generated_schemaserviceclient_getiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java index 6ffacc689a..2d2e1fd522 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/AsyncGetSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/AsyncGetSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetSchema_async] +// [START pubsub_v1_generated_schemaserviceclient_getschema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.GetSchemaRequest; @@ -48,4 +48,4 @@ public static void asyncGetSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetSchema_async] +// [END pubsub_v1_generated_schemaserviceclient_getschema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java index 5daf4351de..dfe599dae7 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_getschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.GetSchemaRequest; import com.google.pubsub.v1.Schema; @@ -45,4 +45,4 @@ public static void syncGetSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_getschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java index c0a7730113..6f4c1ad2b2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaSchemaname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaSchemaname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetSchema_Schemaname_sync] +// [START pubsub_v1_generated_schemaserviceclient_getschema_schemaname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.Schema; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncGetSchemaSchemaname() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetSchema_Schemaname_sync] +// [END pubsub_v1_generated_schemaserviceclient_getschema_schemaname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java index bc666dbc1c..1033d3f4b1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/getschema/SyncGetSchemaString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/getschema/SyncGetSchemaString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_GetSchema_String_sync] +// [START pubsub_v1_generated_schemaserviceclient_getschema_string_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.Schema; import com.google.pubsub.v1.SchemaName; @@ -39,4 +39,4 @@ public static void syncGetSchemaString() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_GetSchema_String_sync] +// [END pubsub_v1_generated_schemaserviceclient_getschema_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java index b32fd480b5..db3e3f29dc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemas.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemas.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ListSchemas_async] +// [START pubsub_v1_generated_schemaserviceclient_listschemas_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ListSchemasRequest; @@ -52,4 +52,4 @@ public static void asyncListSchemas() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ListSchemas_async] +// [END pubsub_v1_generated_schemaserviceclient_listschemas_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java index 6076b5e966..3b09948cd0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/AsyncListSchemasPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/AsyncListSchemasPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ListSchemas_Paged_async] +// [START pubsub_v1_generated_schemaserviceclient_listschemas_paged_async] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSchemasRequest; @@ -60,4 +60,4 @@ public static void asyncListSchemasPaged() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ListSchemas_Paged_async] +// [END pubsub_v1_generated_schemaserviceclient_listschemas_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java index 705545481f..944e349087 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemas.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemas.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ListSchemas_sync] +// [START pubsub_v1_generated_schemaserviceclient_listschemas_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ListSchemasRequest; import com.google.pubsub.v1.ProjectName; @@ -49,4 +49,4 @@ public static void syncListSchemas() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ListSchemas_sync] +// [END pubsub_v1_generated_schemaserviceclient_listschemas_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java index d8508321ea..e763eab4fd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ListSchemas_Projectname_sync] +// [START pubsub_v1_generated_schemaserviceclient_listschemas_projectname_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncListSchemasProjectname() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ListSchemas_Projectname_sync] +// [END pubsub_v1_generated_schemaserviceclient_listschemas_projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java index 51ece993eb..f7e84a3903 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/listschemas/SyncListSchemasString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/listschemas/SyncListSchemasString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ListSchemas_String_sync] +// [START pubsub_v1_generated_schemaserviceclient_listschemas_string_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncListSchemasString() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ListSchemas_String_sync] +// [END pubsub_v1_generated_schemaserviceclient_listschemas_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java index 2ed22cb875..f0bc564208 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_SetIamPolicy_async] +// [START pubsub_v1_generated_schemaserviceclient_setiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_SetIamPolicy_async] +// [END pubsub_v1_generated_schemaserviceclient_setiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java index e5bd624781..8adab7bd36 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_SetIamPolicy_sync] +// [START pubsub_v1_generated_schemaserviceclient_setiampolicy_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_SetIamPolicy_sync] +// [END pubsub_v1_generated_schemaserviceclient_setiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java index f90e406a06..5811d23d1c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_TestIamPermissions_async] +// [START pubsub_v1_generated_schemaserviceclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_TestIamPermissions_async] +// [END pubsub_v1_generated_schemaserviceclient_testiampermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java index 2cc276ac72..da49c01d54 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_TestIamPermissions_sync] +// [START pubsub_v1_generated_schemaserviceclient_testiampermissions_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_TestIamPermissions_sync] +// [END pubsub_v1_generated_schemaserviceclient_testiampermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java index 9e14354d7b..0697504355 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/AsyncValidateMessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/AsyncValidateMessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateMessage_async] +// [START pubsub_v1_generated_schemaserviceclient_validatemessage_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.ByteString; @@ -51,4 +51,4 @@ public static void asyncValidateMessage() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateMessage_async] +// [END pubsub_v1_generated_schemaserviceclient_validatemessage_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java index 639b29346b..12068a1d54 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validatemessage/SyncValidateMessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validatemessage/SyncValidateMessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateMessage_sync] +// [START pubsub_v1_generated_schemaserviceclient_validatemessage_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.protobuf.ByteString; import com.google.pubsub.v1.Encoding; @@ -47,4 +47,4 @@ public static void syncValidateMessage() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateMessage_sync] +// [END pubsub_v1_generated_schemaserviceclient_validatemessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java index ff299bad22..492fcf0803 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/AsyncValidateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/AsyncValidateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateSchema_async] +// [START pubsub_v1_generated_schemaserviceclient_validateschema_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; @@ -49,4 +49,4 @@ public static void asyncValidateSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateSchema_async] +// [END pubsub_v1_generated_schemaserviceclient_validateschema_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java index 4855420298..0d2c0a78a3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_validateschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -45,4 +45,4 @@ public static void syncValidateSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_validateschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java index 02e4cd0c20..fb0ea01fed 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaProjectnameSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaProjectnameSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateSchema_ProjectnameSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_validateschema_projectnameschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncValidateSchemaProjectnameSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateSchema_ProjectnameSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_validateschema_projectnameschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java index 0b99145866..2cca6e3130 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservice/validateschema/SyncValidateSchemaStringSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaserviceclient/validateschema/SyncValidateSchemaStringSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaService_ValidateSchema_StringSchema_sync] +// [START pubsub_v1_generated_schemaserviceclient_validateschema_stringschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Schema; @@ -41,4 +41,4 @@ public static void syncValidateSchemaStringSchema() throws Exception { } } } -// [END pubsub_v1_generated_SchemaService_ValidateSchema_StringSchema_sync] +// [END pubsub_v1_generated_schemaserviceclient_validateschema_stringschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java index b19fdbf7fb..91efa0a7a0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/schemaservicesettings/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SchemaServiceSettings_CreateSchema_sync] +// [START pubsub_v1_generated_schemaservicesettings_createschema_sync] import com.google.cloud.pubsub.v1.SchemaServiceSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateSchema() throws Exception { SchemaServiceSettings schemaServiceSettings = schemaServiceSettingsBuilder.build(); } } -// [END pubsub_v1_generated_SchemaServiceSettings_CreateSchema_sync] +// [END pubsub_v1_generated_schemaservicesettings_createschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java index df62a5021b..659e6f2a4f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/publisherstubsettings/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_PublisherStubSettings_CreateTopic_sync] +// [START pubsub_v1_generated_publisherstubsettings_createtopic_sync] import com.google.cloud.pubsub.v1.stub.PublisherStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateTopic() throws Exception { PublisherStubSettings topicAdminSettings = topicAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_PublisherStubSettings_CreateTopic_sync] +// [END pubsub_v1_generated_publisherstubsettings_createtopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java index 5f9bbe406f..9d6ccf77b1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/schemaservicestubsettings/createschema/SyncCreateSchema.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_SchemaServiceStubSettings_CreateSchema_sync] +// [START pubsub_v1_generated_schemaservicestubsettings_createschema_sync] import com.google.cloud.pubsub.v1.stub.SchemaServiceStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSchema() throws Exception { SchemaServiceStubSettings schemaServiceSettings = schemaServiceSettingsBuilder.build(); } } -// [END pubsub_v1_generated_SchemaServiceStubSettings_CreateSchema_sync] +// [END pubsub_v1_generated_schemaservicestubsettings_createschema_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java index ea4083396e..be52f20f4f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/stub/subscriberstubsettings/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.stub.samples; -// [START pubsub_v1_generated_SubscriberStubSettings_CreateSubscription_sync] +// [START pubsub_v1_generated_subscriberstubsettings_createsubscription_sync] import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSubscription() throws Exception { SubscriberStubSettings subscriptionAdminSettings = subscriptionAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_SubscriberStubSettings_CreateSubscription_sync] +// [END pubsub_v1_generated_subscriberstubsettings_createsubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java index b61fc7b2c6..1b3c606625 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/AsyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Acknowledge_async] +// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -48,4 +48,4 @@ public static void asyncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Acknowledge_async] +// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java index 5a9ffe0368..b906a3e82c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Acknowledge_sync] +// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.AcknowledgeRequest; @@ -45,4 +45,4 @@ public static void syncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Acknowledge_sync] +// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java index 71ca1c00ca..5aa2df865d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] +// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_stringliststring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeStringListstring() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] +// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_stringliststring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java index 23eb8043f2..9c2dcf4927 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] +// [START pubsub_v1_generated_subscriptionadminclient_acknowledge_subscriptionnameliststring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeSubscriptionnameListstring() throws Exception } } } -// [END pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] +// [END pubsub_v1_generated_subscriptionadminclient_acknowledge_subscriptionnameliststring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java index c97f801f0b..3acdaf154e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_subscriptionadminclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_subscriptionadminclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java index f8b340ee5f..8e5d38436b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_subscriptionadminclient_create_setendpoint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_subscriptionadminclient_create_setendpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java index 268d565f18..4eb276cd65 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/AsyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_async] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; @@ -51,4 +51,4 @@ public static void asyncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_async] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java index f1025baa61..dc2bdd6504 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -47,4 +47,4 @@ public static void syncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java index 7fe500754d..a3a11e309b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamestring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamestring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java index cae1578959..5d237c5280 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamesubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameSubscriptionname() throws Excep } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_snapshotnamesubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java index fdf6b8daec..6be73f743d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java index 15bd89cb28..e3c5c25fca 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringsubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsnapshot_stringsubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java index 80d4398dcc..f5c291a69b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/AsyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_async] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; @@ -67,4 +67,4 @@ public static void asyncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_async] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java index 6f7d3845b6..cf9498af7e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.DeadLetterPolicy; @@ -63,4 +63,4 @@ public static void syncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java index 92fa5bfd3e..29689fa996 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_stringstringpushconfigint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringStringPushconfigInt() throws Exce } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_stringstringpushconfigint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java index 141563b0a6..8bb5df7f35 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_stringtopicnamepushconfigint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringTopicnamePushconfigInt() throws E } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_stringtopicnamepushconfigint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java index bfd8ba0ad2..b88fb5fff0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnamestringpushconfigint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionSubscriptionnameStringPushconfigInt() t } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnamestringpushconfigint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java index 7028163a76..db965129bf 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnametopicnamepushconfigint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -46,4 +46,4 @@ public static void syncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt( } } } -// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_createsubscription_subscriptionnametopicnamepushconfigint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java index c85d0f4b06..feb62e0fbe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/AsyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_async] +// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_async] +// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java index a807d55be0..82a245cc5e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java index 5a53e2cf88..4ca1c0bcc6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java index a995d22f73..b728a12ba8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesnapshot/SyncDeleteSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesnapshot_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesnapshot_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java index 60c66767e6..8a55c39faf 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/AsyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSubscription_async] +// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSubscription_async] +// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java index 5eba50c9e9..346e57f842 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSubscription_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSubscriptionRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSubscription_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java index 95ba167c91..075f759ed7 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java index b9af13c79c..e66a3a93e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_deletesubscription_subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_deletesubscription_subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java index 454c352c44..0f9feb64d3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetIamPolicy_async] +// [START pubsub_v1_generated_subscriptionadminclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetIamPolicy_async] +// [END pubsub_v1_generated_subscriptionadminclient_getiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java index 2a0442533e..bdb63a6ab6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetIamPolicy_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getiampolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetIamPolicy_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java index 3683548922..5e95662956 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/AsyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSnapshot_async] +// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; @@ -47,4 +47,4 @@ public static void asyncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSnapshot_async] +// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java index c3e3815562..bc865fa600 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSnapshot_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -43,4 +43,4 @@ public static void syncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSnapshot_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java index c31158a3ab..e9fc164f91 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java index 66ef4b7d19..7de3b85c4e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsnapshot/SyncGetSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsnapshot_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsnapshot_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java index a6ff85a1fe..9b1e63ebc0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/AsyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSubscription_async] +// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSubscription_async] +// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java index a49256c431..cbeabada4d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSubscription_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; import com.google.pubsub.v1.Subscription; @@ -43,4 +43,4 @@ public static void syncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSubscription_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java index 311862d3aa..3bd50b6001 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSubscription_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSubscription_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java index 7cb6dc3a8d..4923c9dcf8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/getsubscription/SyncGetSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_getsubscription_subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_getsubscription_subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java index 945a3c564b..ea951f4f41 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSnapshots_async] +// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -51,4 +51,4 @@ public static void asyncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSnapshots_async] +// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java index 6baa3920b1..28bc0d2083 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/AsyncListSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] +// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -59,4 +59,4 @@ public static void asyncListSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] +// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java index 56a4755df7..261d05cfa8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSnapshots_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSnapshots_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java index ae798c14e5..bd4d286c6d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java index 25651fb030..5b3cba3312 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsnapshots/SyncListSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsnapshots_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsnapshots_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java index a6bca38708..8cc89c6856 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSubscriptions_async] +// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -51,4 +51,4 @@ public static void asyncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSubscriptions_async] +// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java index c07bfa442a..8836db0ab2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/AsyncListSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] +// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -59,4 +59,4 @@ public static void asyncListSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] +// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java index efa610bb8c..d7bb4f92fe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSubscriptions_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSubscriptions_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java index bce6aabc30..d36a99ac62 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java index d11b3fefc3..af1c8187dd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/listsubscriptions/SyncListSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] +// [START pubsub_v1_generated_subscriptionadminclient_listsubscriptions_string_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] +// [END pubsub_v1_generated_subscriptionadminclient_listsubscriptions_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java index 2c80fe321a..7cbd8d2a6f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/AsyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] +// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -50,4 +50,4 @@ public static void asyncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] +// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java index b3462d25da..5be7ebb018 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyAckDeadlineRequest; @@ -46,4 +46,4 @@ public static void syncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java index 50afc17d80..7b40b2dbc2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_stringliststringint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineStringListstringInt() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_stringliststringint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java index 9508d6080c..208b31b256 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_subscriptionnameliststringint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineSubscriptionnameListstringInt() throws E } } } -// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifyackdeadline_subscriptionnameliststringint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java index aa51e8dc59..668ec61965 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/AsyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_async] +// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -49,4 +49,4 @@ public static void asyncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_async] +// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java index a6fbb2a8de..72f4e5369c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyPushConfigRequest; @@ -45,4 +45,4 @@ public static void syncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java index 71642d3a42..ac730021be 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigStringPushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_stringpushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigStringPushconfig() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_stringpushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java similarity index 89% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java index f65ac93e46..de4a8dfbd9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [START pubsub_v1_generated_subscriptionadminclient_modifypushconfig_subscriptionnamepushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigSubscriptionnamePushconfig() throws Excep } } } -// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [END pubsub_v1_generated_subscriptionadminclient_modifypushconfig_subscriptionnamepushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java index 4ab60d852d..c893d34fee 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/AsyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_async] +// [START pubsub_v1_generated_subscriptionadminclient_pull_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; @@ -48,4 +48,4 @@ public static void asyncPull() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_async] +// [END pubsub_v1_generated_subscriptionadminclient_pull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java index 8bed94fe25..6704f86359 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_sync] +// [START pubsub_v1_generated_subscriptionadminclient_pull_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; import com.google.pubsub.v1.PullResponse; @@ -45,4 +45,4 @@ public static void syncPull() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_sync] +// [END pubsub_v1_generated_subscriptionadminclient_pull_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java index ae23e170c9..00f4ebb1d1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_pull_stringbooleanint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullStringBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_pull_stringbooleanint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java index 19bb1784a2..e0c3a4f0e9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullStringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_StringInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_pull_stringint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullStringInt() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_StringInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_pull_stringint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java index 9ade351b72..04beea7b2c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnamebooleanint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullSubscriptionnameBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnamebooleanint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java index 61a62b6a2f..853c300295 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/pull/SyncPullSubscriptionnameInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] +// [START pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnameint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullSubscriptionnameInt() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] +// [END pubsub_v1_generated_subscriptionadminclient_pull_subscriptionnameint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java index c3641d8473..d5443a89e1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/AsyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Seek_async] +// [START pubsub_v1_generated_subscriptionadminclient_seek_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; @@ -46,4 +46,4 @@ public static void asyncSeek() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Seek_async] +// [END pubsub_v1_generated_subscriptionadminclient_seek_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java index 6ff5634e7f..ce4818173c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/seek/SyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_Seek_sync] +// [START pubsub_v1_generated_subscriptionadminclient_seek_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; import com.google.pubsub.v1.SeekResponse; @@ -43,4 +43,4 @@ public static void syncSeek() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_Seek_sync] +// [END pubsub_v1_generated_subscriptionadminclient_seek_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java index d24e119bbd..577c1380ff 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_SetIamPolicy_async] +// [START pubsub_v1_generated_subscriptionadminclient_setiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_SetIamPolicy_async] +// [END pubsub_v1_generated_subscriptionadminclient_setiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java index 9c3b9b27e2..7f0493ca7e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_SetIamPolicy_sync] +// [START pubsub_v1_generated_subscriptionadminclient_setiampolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_SetIamPolicy_sync] +// [END pubsub_v1_generated_subscriptionadminclient_setiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java index eac398483f..977dca9e23 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/streamingpull/AsyncStreamingPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_StreamingPull_async] +// [START pubsub_v1_generated_subscriptionadminclient_streamingpull_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.StreamingPullRequest; @@ -57,4 +57,4 @@ public static void asyncStreamingPull() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_StreamingPull_async] +// [END pubsub_v1_generated_subscriptionadminclient_streamingpull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java index 2060857ad6..e23f707afd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_TestIamPermissions_async] +// [START pubsub_v1_generated_subscriptionadminclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_TestIamPermissions_async] +// [END pubsub_v1_generated_subscriptionadminclient_testiampermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java index e25ec0d84b..12d3af92b3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_TestIamPermissions_sync] +// [START pubsub_v1_generated_subscriptionadminclient_testiampermissions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_TestIamPermissions_sync] +// [END pubsub_v1_generated_subscriptionadminclient_testiampermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java index 16fadb5d46..d53c3e6002 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/AsyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_async] +// [START pubsub_v1_generated_subscriptionadminclient_updatesnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_async] +// [END pubsub_v1_generated_subscriptionadminclient_updatesnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java index fce6a9df70..07efdc75e4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesnapshot/SyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] +// [START pubsub_v1_generated_subscriptionadminclient_updatesnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Snapshot; @@ -44,4 +44,4 @@ public static void syncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] +// [END pubsub_v1_generated_subscriptionadminclient_updatesnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java index 1e3fbd18f2..61872dc63a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/AsyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_UpdateSubscription_async] +// [START pubsub_v1_generated_subscriptionadminclient_updatesubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_UpdateSubscription_async] +// [END pubsub_v1_generated_subscriptionadminclient_updatesubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java index 517495e7a4..ef29dce71a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminclient/updatesubscription/SyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Subscriber_UpdateSubscription_sync] +// [START pubsub_v1_generated_subscriptionadminclient_updatesubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Subscription; @@ -44,4 +44,4 @@ public static void syncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Subscriber_UpdateSubscription_sync] +// [END pubsub_v1_generated_subscriptionadminclient_updatesubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java index 4b8fc85b52..9f7b49153c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadminsettings/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdminSettings_CreateSubscription_sync] +// [START pubsub_v1_generated_subscriptionadminsettings_createsubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import java.time.Duration; @@ -46,4 +46,4 @@ public static void syncCreateSubscription() throws Exception { SubscriptionAdminSettings subscriptionAdminSettings = subscriptionAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_SubscriptionAdminSettings_CreateSubscription_sync] +// [END pubsub_v1_generated_subscriptionadminsettings_createsubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java index 47792ee22d..73b3852ce3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_topicadminclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_topicadminclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java index 19398974d1..d3010d7cdb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_topicadminclient_create_setendpoint_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_topicadminclient_create_setendpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java index 74621080e4..9e392a2e53 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/AsyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_CreateTopic_async] +// [START pubsub_v1_generated_topicadminclient_createtopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; @@ -55,4 +55,4 @@ public static void asyncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_CreateTopic_async] +// [END pubsub_v1_generated_topicadminclient_createtopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java index a4b5de14e9..0811718acb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_CreateTopic_sync] +// [START pubsub_v1_generated_topicadminclient_createtopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.MessageStoragePolicy; @@ -52,4 +52,4 @@ public static void syncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_CreateTopic_sync] +// [END pubsub_v1_generated_topicadminclient_createtopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java index c5d7bf9bc2..db218d5ab6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_CreateTopic_String_sync] +// [START pubsub_v1_generated_topicadminclient_createtopic_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_CreateTopic_String_sync] +// [END pubsub_v1_generated_topicadminclient_createtopic_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java index 3fe1d8d1ce..40c1e72690 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/createtopic/SyncCreateTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] +// [START pubsub_v1_generated_topicadminclient_createtopic_topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] +// [END pubsub_v1_generated_topicadminclient_createtopic_topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java index 7333b31068..4984ec56a2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/AsyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DeleteTopic_async] +// [START pubsub_v1_generated_topicadminclient_deletetopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DeleteTopic_async] +// [END pubsub_v1_generated_topicadminclient_deletetopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java index 592d02f1e2..fa1ed996ea 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DeleteTopic_sync] +// [START pubsub_v1_generated_topicadminclient_deletetopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteTopicRequest; @@ -43,4 +43,4 @@ public static void syncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DeleteTopic_sync] +// [END pubsub_v1_generated_topicadminclient_deletetopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java index e38c29ba6c..c4476880bb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DeleteTopic_String_sync] +// [START pubsub_v1_generated_topicadminclient_deletetopic_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DeleteTopic_String_sync] +// [END pubsub_v1_generated_topicadminclient_deletetopic_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java index d7e2b5ecfb..3e06153b59 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/deletetopic/SyncDeleteTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] +// [START pubsub_v1_generated_topicadminclient_deletetopic_topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] +// [END pubsub_v1_generated_topicadminclient_deletetopic_topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java index 6f476688b0..ea439643f6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/AsyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DetachSubscription_async] +// [START pubsub_v1_generated_topicadminclient_detachsubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DetachSubscription_async] +// [END pubsub_v1_generated_topicadminclient_detachsubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java index d246600768..9921df6dc0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/detachsubscription/SyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_DetachSubscription_sync] +// [START pubsub_v1_generated_topicadminclient_detachsubscription_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -43,4 +43,4 @@ public static void syncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_DetachSubscription_sync] +// [END pubsub_v1_generated_topicadminclient_detachsubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java index 7811b64d9b..6d374e2d12 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetIamPolicy_async] +// [START pubsub_v1_generated_topicadminclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetIamPolicy_async] +// [END pubsub_v1_generated_topicadminclient_getiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java index 22b082ae1d..9a7b21f97b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetIamPolicy_sync] +// [START pubsub_v1_generated_topicadminclient_getiampolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetIamPolicy_sync] +// [END pubsub_v1_generated_topicadminclient_getiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java index 6186bbc7f2..a9c350d1a9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/AsyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetTopic_async] +// [START pubsub_v1_generated_topicadminclient_gettopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; @@ -46,4 +46,4 @@ public static void asyncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetTopic_async] +// [END pubsub_v1_generated_topicadminclient_gettopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java index dae908367f..417ff4bbee 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetTopic_sync] +// [START pubsub_v1_generated_topicadminclient_gettopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.Topic; @@ -43,4 +43,4 @@ public static void syncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetTopic_sync] +// [END pubsub_v1_generated_topicadminclient_gettopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java index 880d718804..e18e0fd46d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetTopic_String_sync] +// [START pubsub_v1_generated_topicadminclient_gettopic_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetTopic_String_sync] +// [END pubsub_v1_generated_topicadminclient_gettopic_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java index f1b638ad0c..d5c014b004 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/gettopic/SyncGetTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] +// [START pubsub_v1_generated_topicadminclient_gettopic_topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] +// [END pubsub_v1_generated_topicadminclient_gettopic_topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java index bb5c209e76..204698edd8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopics_async] +// [START pubsub_v1_generated_topicadminclient_listtopics_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopics_async] +// [END pubsub_v1_generated_topicadminclient_listtopics_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java index bc408435bb..674eb38ee0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/AsyncListTopicsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopics_Paged_async] +// [START pubsub_v1_generated_topicadminclient_listtopics_paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicsPaged() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopics_Paged_async] +// [END pubsub_v1_generated_topicadminclient_listtopics_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java index ef06991673..c613ba487b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopics_sync] +// [START pubsub_v1_generated_topicadminclient_listtopics_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopics_sync] +// [END pubsub_v1_generated_topicadminclient_listtopics_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java index 81bc425073..85213f1674 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] +// [START pubsub_v1_generated_topicadminclient_listtopics_projectname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] +// [END pubsub_v1_generated_topicadminclient_listtopics_projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java index 99bcc8bf29..6a8d893f07 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopics/SyncListTopicsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopics_String_sync] +// [START pubsub_v1_generated_topicadminclient_listtopics_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopics_String_sync] +// [END pubsub_v1_generated_topicadminclient_listtopics_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java index d443239958..9b862febb8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_async] +// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_async] +// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java index 70abfdafec..7d39cf98d3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] +// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] +// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java index c09b9310f2..4fe184cae8 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java index 6b1af0211a..6c6ea28f01 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java index b049daf378..835c9ba0f1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsnapshots_topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsnapshots_topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java index b4e989dd9d..684c18072e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] +// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] +// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java index f58ba30e98..056cacdc03 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] +// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] +// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java index acbe537c50..5106175cdf 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java index 51cc955ab3..0f3a7de139 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_string_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_string_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java index c9ca4db89c..c94024d9bd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] +// [START pubsub_v1_generated_topicadminclient_listtopicsubscriptions_topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] +// [END pubsub_v1_generated_topicadminclient_listtopicsubscriptions_topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java index 5923a643cc..0428022c89 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/AsyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Publish_async] +// [START pubsub_v1_generated_topicadminclient_publish_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; @@ -49,4 +49,4 @@ public static void asyncPublish() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_Publish_async] +// [END pubsub_v1_generated_topicadminclient_publish_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java index a38c98b0be..82abe2dcc5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Publish_sync] +// [START pubsub_v1_generated_topicadminclient_publish_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; import com.google.pubsub.v1.PublishResponse; @@ -46,4 +46,4 @@ public static void syncPublish() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_Publish_sync] +// [END pubsub_v1_generated_topicadminclient_publish_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java index af9f822ea4..304ed27e2d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishStringListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] +// [START pubsub_v1_generated_topicadminclient_publish_stringlistpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishStringListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] +// [END pubsub_v1_generated_topicadminclient_publish_stringlistpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java index 8f4cac5379..049d7bd628 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/publish/SyncPublishTopicnameListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] +// [START pubsub_v1_generated_topicadminclient_publish_topicnamelistpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishTopicnameListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] +// [END pubsub_v1_generated_topicadminclient_publish_topicnamelistpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java index 7532610f06..99d5635a28 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_SetIamPolicy_async] +// [START pubsub_v1_generated_topicadminclient_setiampolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_SetIamPolicy_async] +// [END pubsub_v1_generated_topicadminclient_setiampolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java index 9bade67c6b..e362c3811a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_SetIamPolicy_sync] +// [START pubsub_v1_generated_topicadminclient_setiampolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_SetIamPolicy_sync] +// [END pubsub_v1_generated_topicadminclient_setiampolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java index c2718a9def..880ce9aa23 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_TestIamPermissions_async] +// [START pubsub_v1_generated_topicadminclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_TestIamPermissions_async] +// [END pubsub_v1_generated_topicadminclient_testiampermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java index ab708587bc..de87ca7134 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_TestIamPermissions_sync] +// [START pubsub_v1_generated_topicadminclient_testiampermissions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_TestIamPermissions_sync] +// [END pubsub_v1_generated_topicadminclient_testiampermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java index b9aa104687..4455b8f198 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/AsyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_UpdateTopic_async] +// [START pubsub_v1_generated_topicadminclient_updatetopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; @@ -47,4 +47,4 @@ public static void asyncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_UpdateTopic_async] +// [END pubsub_v1_generated_topicadminclient_updatetopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java index 83ca0b9f16..5ba8feede1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminclient/updatetopic/SyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_Publisher_UpdateTopic_sync] +// [START pubsub_v1_generated_topicadminclient_updatetopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Topic; @@ -44,4 +44,4 @@ public static void syncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_Publisher_UpdateTopic_sync] +// [END pubsub_v1_generated_topicadminclient_updatetopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java index e716aca1df..5e38346067 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadminsettings/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdminSettings_CreateTopic_sync] +// [START pubsub_v1_generated_topicadminsettings_createtopic_sync] import com.google.cloud.pubsub.v1.TopicAdminSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncCreateTopic() throws Exception { TopicAdminSettings topicAdminSettings = topicAdminSettingsBuilder.build(); } } -// [END pubsub_v1_generated_TopicAdminSettings_CreateTopic_sync] +// [END pubsub_v1_generated_topicadminsettings_createtopic_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java index 97a5a48105..84b8b68262 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_Create_SetCredentialsProvider_sync] +// [START redis_v1beta1_generated_cloudredisclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CloudRedisSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings); } } -// [END redis_v1beta1_generated_CloudRedis_Create_SetCredentialsProvider_sync] +// [END redis_v1beta1_generated_cloudredisclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java index 91b14d3867..dc877d2084 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_Create_SetEndpoint_sync] +// [START redis_v1beta1_generated_cloudredisclient_create_setendpoint_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CloudRedisSettings; import com.google.cloud.redis.v1beta1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings); } } -// [END redis_v1beta1_generated_CloudRedis_Create_SetEndpoint_sync] +// [END redis_v1beta1_generated_cloudredisclient_create_setendpoint_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java index 6e439e0dce..96519758d6 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_CreateInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_createinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncCreateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_CreateInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_createinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java index 6399d91963..35fea74142 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/AsyncCreateInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/AsyncCreateInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_CreateInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_createinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; @@ -50,4 +50,4 @@ public static void asyncCreateInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_CreateInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_createinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java index c5ddf37679..ba5cd839a1 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_CreateInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_createinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.CreateInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -45,4 +45,4 @@ public static void syncCreateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_CreateInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_createinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java index 11313ca84b..4a0d38a859 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceLocationnameStringInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_CreateInstance_LocationnameStringInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_createinstance_locationnamestringinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncCreateInstanceLocationnameStringInstance() throws Excepti } } } -// [END redis_v1beta1_generated_CloudRedis_CreateInstance_LocationnameStringInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_createinstance_locationnamestringinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java index 9ee0ca14d4..e3af6e6083 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/createinstance/SyncCreateInstanceStringStringInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/createinstance/SyncCreateInstanceStringStringInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_CreateInstance_StringStringInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_createinstance_stringstringinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncCreateInstanceStringStringInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_CreateInstance_StringStringInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_createinstance_stringstringinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java index de5db2b35a..be1676aca8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java index 3ec5e853bf..d1eb442ee8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/AsyncDeleteInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/AsyncDeleteInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java index e1966e46ec..33b0ebb99e 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; import com.google.cloud.redis.v1beta1.InstanceName; @@ -43,4 +43,4 @@ public static void syncDeleteInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java index 88e9c960dd..942b4b99e3 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_Instancename_sync] +// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteInstanceInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_Instancename_sync] +// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java index 676a72f40e..64add1b20c 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/deleteinstance/SyncDeleteInstanceString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_DeleteInstance_String_sync] +// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteInstanceString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_DeleteInstance_String_sync] +// [END redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java index a708fea978..dfef10de39 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ExportInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_exportinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; @@ -47,4 +47,4 @@ public static void asyncExportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ExportInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_exportinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java index 82df97b5f0..4eb0cd23e0 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/AsyncExportInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/AsyncExportInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ExportInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_exportinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncExportInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ExportInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_exportinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java index f67d16d01b..0a6078e327 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ExportInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_exportinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ExportInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -44,4 +44,4 @@ public static void syncExportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ExportInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_exportinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java index 840fe4f0a4..1e3a19f42b 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/exportinstance/SyncExportInstanceStringOutputconfig.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/exportinstance/SyncExportInstanceStringOutputconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ExportInstance_StringOutputconfig_sync] +// [START redis_v1beta1_generated_cloudredisclient_exportinstance_stringoutputconfig_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.OutputConfig; @@ -40,4 +40,4 @@ public static void syncExportInstanceStringOutputconfig() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ExportInstance_StringOutputconfig_sync] +// [END redis_v1beta1_generated_cloudredisclient_exportinstance_stringoutputconfig_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java index 9d5dad8db3..a6cf421f48 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncFailoverInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java index 03091e3767..05f0f05aec 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/AsyncFailoverInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/AsyncFailoverInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; @@ -48,4 +48,4 @@ public static void asyncFailoverInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java index 9fd4f0823a..f5c369f45f 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java similarity index 88% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java index 725f87aa07..7fdd68b0a1 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_InstancenameFailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr } } } -// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_InstancenameFailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java similarity index 89% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java index 42404416ba..54d5a60b95 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_FailoverInstance_StringFailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti } } } -// [END redis_v1beta1_generated_CloudRedis_FailoverInstance_StringFailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java index 50e7e345fe..a447cd39e7 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/AsyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/AsyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_getinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceRequest; @@ -46,4 +46,4 @@ public static void asyncGetInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_getinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java index 51a60582bd..4bc00a7ab7 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -43,4 +43,4 @@ public static void syncGetInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java index 06236cdee0..e22472c887 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstance_Instancename_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstance_instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstance_Instancename_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstance_instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java index 884d4e2544..1d3b929808 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstance/SyncGetInstanceString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstance/SyncGetInstanceString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstance_String_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstance_string_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstance_String_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstance_string_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java index 8b6d217ea1..070ea20e4e 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/AsyncGetInstanceAuthString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/AsyncGetInstanceAuthString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_async] +// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceAuthStringRequest; @@ -47,4 +47,4 @@ public static void asyncGetInstanceAuthString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_async] +// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java index 8e1750fb99..9bf0be720f 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.GetInstanceAuthStringRequest; import com.google.cloud.redis.v1beta1.InstanceAuthString; @@ -43,4 +43,4 @@ public static void syncGetInstanceAuthString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java index aba48b769d..51ccae536e 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringInstancename.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_Instancename_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceAuthString; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceAuthStringInstancename() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_Instancename_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_instancename_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java index 01ce1d2431..2099b73459 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/getinstanceauthstring/SyncGetInstanceAuthStringString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/getinstanceauthstring/SyncGetInstanceAuthStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_String_sync] +// [START redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_string_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceAuthString; import com.google.cloud.redis.v1beta1.InstanceName; @@ -39,4 +39,4 @@ public static void syncGetInstanceAuthStringString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_GetInstanceAuthString_String_sync] +// [END redis_v1beta1_generated_cloudredisclient_getinstanceauthstring_string_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java index 3f62233680..d35688f486 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ImportInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_importinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; @@ -47,4 +47,4 @@ public static void asyncImportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ImportInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_importinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java index d42251d1ef..da4076dc26 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/AsyncImportInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/AsyncImportInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ImportInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_importinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; @@ -49,4 +49,4 @@ public static void asyncImportInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ImportInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_importinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java index f263e715d8..91af8a59c5 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ImportInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_importinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.ImportInstanceRequest; import com.google.cloud.redis.v1beta1.InputConfig; @@ -44,4 +44,4 @@ public static void syncImportInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ImportInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_importinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java index ddea6e6e40..074dea83e1 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/importinstance/SyncImportInstanceStringInputconfig.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/importinstance/SyncImportInstanceStringInputconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ImportInstance_StringInputconfig_sync] +// [START redis_v1beta1_generated_cloudredisclient_importinstance_stringinputconfig_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InputConfig; import com.google.cloud.redis.v1beta1.Instance; @@ -40,4 +40,4 @@ public static void syncImportInstanceStringInputconfig() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ImportInstance_StringInputconfig_sync] +// [END redis_v1beta1_generated_cloudredisclient_importinstance_stringinputconfig_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java index 20c7f67e8f..666111e35e 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstances.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstances.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ListInstances_async] +// [START redis_v1beta1_generated_cloudredisclient_listinstances_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -51,4 +51,4 @@ public static void asyncListInstances() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ListInstances_async] +// [END redis_v1beta1_generated_cloudredisclient_listinstances_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java index d9bfef025a..b528de4cfa 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/AsyncListInstancesPaged.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/AsyncListInstancesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ListInstances_Paged_async] +// [START redis_v1beta1_generated_cloudredisclient_listinstances_paged_async] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.ListInstancesRequest; @@ -58,4 +58,4 @@ public static void asyncListInstancesPaged() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ListInstances_Paged_async] +// [END redis_v1beta1_generated_cloudredisclient_listinstances_paged_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java index f1273b5344..8b44b76ab9 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstances.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstances.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ListInstances_sync] +// [START redis_v1beta1_generated_cloudredisclient_listinstances_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.ListInstancesRequest; @@ -47,4 +47,4 @@ public static void syncListInstances() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ListInstances_sync] +// [END redis_v1beta1_generated_cloudredisclient_listinstances_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java index 9298fb26d5..074b04ba05 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesLocationname.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ListInstances_Locationname_sync] +// [START redis_v1beta1_generated_cloudredisclient_listinstances_locationname_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncListInstancesLocationname() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ListInstances_Locationname_sync] +// [END redis_v1beta1_generated_cloudredisclient_listinstances_locationname_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java index 1e7395077b..32a46245a8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/listinstances/SyncListInstancesString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/listinstances/SyncListInstancesString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_ListInstances_String_sync] +// [START redis_v1beta1_generated_cloudredisclient_listinstances_string_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.LocationName; @@ -41,4 +41,4 @@ public static void syncListInstancesString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_ListInstances_String_sync] +// [END redis_v1beta1_generated_cloudredisclient_listinstances_string_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java index 0cd397acca..6afd7c602a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_async] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; @@ -49,4 +49,4 @@ public static void asyncRescheduleMaintenance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_async] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java index d9b3ae2e1b..d37e56f918 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/AsyncRescheduleMaintenanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -50,4 +50,4 @@ public static void asyncRescheduleMaintenanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java index 5b97aea2e8..8b8238870a 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_sync] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -45,4 +45,4 @@ public static void syncRescheduleMaintenance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_sync] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java similarity index 88% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java index b0291cf630..3cb0db55f3 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_InstancenameReschedulemaintenancerequestrescheduletypeTimestamp_sync] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -48,4 +48,4 @@ public static void main(String[] args) throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_InstancenameReschedulemaintenancerequestrescheduletypeTimestamp_sync] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java similarity index 89% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java index c9f19c0ff2..ec59dafbe3 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_StringReschedulemaintenancerequestrescheduletypeTimestamp_sync] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -47,4 +47,4 @@ public static void main(String[] args) throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_RescheduleMaintenance_StringReschedulemaintenancerequestrescheduletypeTimestamp_sync] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java index bbfd0e043a..5e60c29ba8 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_updateinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -48,4 +48,4 @@ public static void asyncUpdateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_updateinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java index 342b132f9d..fcbc0ff763 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/AsyncUpdateInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/AsyncUpdateInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_updateinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -49,4 +49,4 @@ public static void asyncUpdateInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_updateinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java index 8bb1c193fe..f1bea39c8f 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_updateinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.UpdateInstanceRequest; @@ -44,4 +44,4 @@ public static void syncUpdateInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_updateinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java index 65d41c35ab..d400476d73 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/updateinstance/SyncUpdateInstanceFieldmaskInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/updateinstance/SyncUpdateInstanceFieldmaskInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpdateInstance_FieldmaskInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_updateinstance_fieldmaskinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.protobuf.FieldMask; @@ -40,4 +40,4 @@ public static void syncUpdateInstanceFieldmaskInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpdateInstance_FieldmaskInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_updateinstance_fieldmaskinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java index 64e797aed0..9f91d32f63 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_async] +// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_async] import com.google.api.core.ApiFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; @@ -47,4 +47,4 @@ public static void asyncUpgradeInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_async] +// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java similarity index 93% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java index 9db9a43a4f..9837b00214 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/AsyncUpgradeInstanceLRO.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/AsyncUpgradeInstanceLRO.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_LRO_async] +// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_lro_async] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; @@ -49,4 +49,4 @@ public static void asyncUpgradeInstanceLRO() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_LRO_async] +// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_lro_async] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java similarity index 92% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java index 64108a66fc..54ad26057c 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_sync] +// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -44,4 +44,4 @@ public static void syncUpgradeInstance() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_sync] +// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java similarity index 90% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java index 6026622393..b2249259df 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceInstancenameString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceInstancenameString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_InstancenameString_sync] +// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_instancenamestring_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -40,4 +40,4 @@ public static void syncUpgradeInstanceInstancenameString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_InstancenameString_sync] +// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_instancenamestring_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java similarity index 91% rename from test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java rename to test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java index 2081697271..4dfc6e9b85 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredis/upgradeinstance/SyncUpgradeInstanceStringString.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredisclient/upgradeinstance/SyncUpgradeInstanceStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedis_UpgradeInstance_StringString_sync] +// [START redis_v1beta1_generated_cloudredisclient_upgradeinstance_stringstring_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -40,4 +40,4 @@ public static void syncUpgradeInstanceStringString() throws Exception { } } } -// [END redis_v1beta1_generated_CloudRedis_UpgradeInstance_StringString_sync] +// [END redis_v1beta1_generated_cloudredisclient_upgradeinstance_stringstring_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java index e8fb16fa8a..09bc7209e5 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/cloudredissettings/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START redis_v1beta1_generated_CloudRedisSettings_GetInstance_sync] +// [START redis_v1beta1_generated_cloudredissettings_getinstance_sync] import com.google.cloud.redis.v1beta1.CloudRedisSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetInstance() throws Exception { CloudRedisSettings cloudRedisSettings = cloudRedisSettingsBuilder.build(); } } -// [END redis_v1beta1_generated_CloudRedisSettings_GetInstance_sync] +// [END redis_v1beta1_generated_cloudredissettings_getinstance_sync] diff --git a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java index 364e543a79..4e3bd14b06 100644 --- a/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java +++ b/test/integration/goldens/redis/samples/snippets/generated/main/java/com/google/cloud/redis/v1beta1/stub/cloudredisstubsettings/getinstance/SyncGetInstance.java @@ -16,7 +16,7 @@ package com.google.cloud.redis.v1beta1.stub.samples; -// [START redis_v1beta1_generated_CloudRedisStubSettings_GetInstance_sync] +// [START redis_v1beta1_generated_cloudredisstubsettings_getinstance_sync] import com.google.cloud.redis.v1beta1.stub.CloudRedisStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncGetInstance() throws Exception { CloudRedisStubSettings cloudRedisSettings = cloudRedisSettingsBuilder.build(); } } -// [END redis_v1beta1_generated_CloudRedisStubSettings_GetInstance_sync] +// [END redis_v1beta1_generated_cloudredisstubsettings_getinstance_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java index 0e7d8f5b05..600ff7ed69 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/AsyncComposeObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/AsyncComposeObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ComposeObject_async] +// [START storage_v2_generated_storageclient_composeobject_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -59,4 +59,4 @@ public static void asyncComposeObject() throws Exception { } } } -// [END storage_v2_generated_Storage_ComposeObject_async] +// [END storage_v2_generated_storageclient_composeobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java index 3ae9348e7b..981389805d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/composeobject/SyncComposeObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/composeobject/SyncComposeObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ComposeObject_sync] +// [START storage_v2_generated_storageclient_composeobject_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.ComposeObjectRequest; @@ -56,4 +56,4 @@ public static void syncComposeObject() throws Exception { } } } -// [END storage_v2_generated_Storage_ComposeObject_sync] +// [END storage_v2_generated_storageclient_composeobject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java index c17ea693e1..85bff4fd73 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_Create_SetCredentialsProvider_sync] +// [START storage_v2_generated_storageclient_create_setcredentialsprovider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.storage.v2.StorageClient; import com.google.storage.v2.StorageSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { StorageClient storageClient = StorageClient.create(storageSettings); } } -// [END storage_v2_generated_Storage_Create_SetCredentialsProvider_sync] +// [END storage_v2_generated_storageclient_create_setcredentialsprovider_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java index b43c1b1baa..c25efcc648 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_Create_SetEndpoint_sync] +// [START storage_v2_generated_storageclient_create_setendpoint_sync] import com.google.storage.v2.StorageClient; import com.google.storage.v2.StorageSettings; import com.google.storage.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { StorageClient storageClient = StorageClient.create(storageSettings); } } -// [END storage_v2_generated_Storage_Create_SetEndpoint_sync] +// [END storage_v2_generated_storageclient_create_setendpoint_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java index 6ffaca8866..bdce3c935b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateBucket_async] +// [START storage_v2_generated_storageclient_createbucket_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.Bucket; import com.google.storage.v2.CreateBucketRequest; @@ -52,4 +52,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateBucket_async] +// [END storage_v2_generated_storageclient_createbucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java index 5978d8d46e..933718403f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateBucket_sync] +// [START storage_v2_generated_storageclient_createbucket_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.CreateBucketRequest; import com.google.storage.v2.PredefinedBucketAcl; @@ -49,4 +49,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateBucket_sync] +// [END storage_v2_generated_storageclient_createbucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java index 38fba8446b..40af1d09c1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketProjectnameBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketProjectnameBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateBucket_ProjectnameBucketString_sync] +// [START storage_v2_generated_storageclient_createbucket_projectnamebucketstring_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncCreateBucketProjectnameBucketString() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateBucket_ProjectnameBucketString_sync] +// [END storage_v2_generated_storageclient_createbucket_projectnamebucketstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java index 7c6327688c..347bcd2613 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createbucket/SyncCreateBucketStringBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createbucket/SyncCreateBucketStringBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateBucket_StringBucketString_sync] +// [START storage_v2_generated_storageclient_createbucket_stringbucketstring_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncCreateBucketStringBucketString() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateBucket_StringBucketString_sync] +// [END storage_v2_generated_storageclient_createbucket_stringbucketstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java index 82e3900e95..a309a09f9c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/AsyncCreateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/AsyncCreateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateHmacKey_async] +// [START storage_v2_generated_storageclient_createhmackey_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.CreateHmacKeyRequest; @@ -50,4 +50,4 @@ public static void asyncCreateHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateHmacKey_async] +// [END storage_v2_generated_storageclient_createhmackey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java index 6a77091f33..1fc92bad1b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateHmacKey_sync] +// [START storage_v2_generated_storageclient_createhmackey_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.CreateHmacKeyRequest; import com.google.storage.v2.CreateHmacKeyResponse; @@ -46,4 +46,4 @@ public static void syncCreateHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateHmacKey_sync] +// [END storage_v2_generated_storageclient_createhmackey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java index fc3577f1aa..f5ec47da68 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyProjectnameString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyProjectnameString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateHmacKey_ProjectnameString_sync] +// [START storage_v2_generated_storageclient_createhmackey_projectnamestring_sync] import com.google.storage.v2.CreateHmacKeyResponse; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateHmacKeyProjectnameString() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateHmacKey_ProjectnameString_sync] +// [END storage_v2_generated_storageclient_createhmackey_projectnamestring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java index 9223e5e485..dc0ad3ab2b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createhmackey/SyncCreateHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createhmackey/SyncCreateHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateHmacKey_StringString_sync] +// [START storage_v2_generated_storageclient_createhmackey_stringstring_sync] import com.google.storage.v2.CreateHmacKeyResponse; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateHmacKey_StringString_sync] +// [END storage_v2_generated_storageclient_createhmackey_stringstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java index 6155ee24d4..fdaee0a18f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/AsyncCreateNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/AsyncCreateNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateNotification_async] +// [START storage_v2_generated_storageclient_createnotification_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CreateNotificationRequest; import com.google.storage.v2.Notification; @@ -48,4 +48,4 @@ public static void asyncCreateNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateNotification_async] +// [END storage_v2_generated_storageclient_createnotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java index f48aec3a56..e184870aee 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateNotification_sync] +// [START storage_v2_generated_storageclient_createnotification_sync] import com.google.storage.v2.CreateNotificationRequest; import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; @@ -44,4 +44,4 @@ public static void syncCreateNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateNotification_sync] +// [END storage_v2_generated_storageclient_createnotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java index bacc5f080b..18b1de9bc4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationProjectnameNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationProjectnameNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateNotification_ProjectnameNotification_sync] +// [START storage_v2_generated_storageclient_createnotification_projectnamenotification_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateNotificationProjectnameNotification() throws Except } } } -// [END storage_v2_generated_Storage_CreateNotification_ProjectnameNotification_sync] +// [END storage_v2_generated_storageclient_createnotification_projectnamenotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java index 8958897191..d46baddb9e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/createnotification/SyncCreateNotificationStringNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/createnotification/SyncCreateNotificationStringNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_CreateNotification_StringNotification_sync] +// [START storage_v2_generated_storageclient_createnotification_stringnotification_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncCreateNotificationStringNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_CreateNotification_StringNotification_sync] +// [END storage_v2_generated_storageclient_createnotification_stringnotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java index 383879beda..dffde3bea3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteBucket_async] +// [START storage_v2_generated_storageclient_deletebucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; @@ -50,4 +50,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteBucket_async] +// [END storage_v2_generated_storageclient_deletebucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java index 9f273a03b6..0ba562f105 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteBucket_sync] +// [START storage_v2_generated_storageclient_deletebucket_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonRequestParams; @@ -47,4 +47,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteBucket_sync] +// [END storage_v2_generated_storageclient_deletebucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java index 058b3ba4e2..df4a03d236 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteBucket_Bucketname_sync] +// [START storage_v2_generated_storageclient_deletebucket_bucketname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteBucketBucketname() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteBucket_Bucketname_sync] +// [END storage_v2_generated_storageclient_deletebucket_bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java index 5f2ad3506c..2da6d7f5e1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletebucket/SyncDeleteBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletebucket/SyncDeleteBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteBucket_String_sync] +// [START storage_v2_generated_storageclient_deletebucket_string_sync] import com.google.protobuf.Empty; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteBucketString() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteBucket_String_sync] +// [END storage_v2_generated_storageclient_deletebucket_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java index 4d5371ce77..76bc4d96ca 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/AsyncDeleteHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/AsyncDeleteHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteHmacKey_async] +// [START storage_v2_generated_storageclient_deletehmackey_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.CommonRequestParams; @@ -49,4 +49,4 @@ public static void asyncDeleteHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteHmacKey_async] +// [END storage_v2_generated_storageclient_deletehmackey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java index 4c4987aae3..7963ea332d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteHmacKey_sync] +// [START storage_v2_generated_storageclient_deletehmackey_sync] import com.google.protobuf.Empty; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.DeleteHmacKeyRequest; @@ -46,4 +46,4 @@ public static void syncDeleteHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteHmacKey_sync] +// [END storage_v2_generated_storageclient_deletehmackey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java index 8268243bb2..94737c7400 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteHmacKey_StringProjectname_sync] +// [START storage_v2_generated_storageclient_deletehmackey_stringprojectname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteHmacKeyStringProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteHmacKey_StringProjectname_sync] +// [END storage_v2_generated_storageclient_deletehmackey_stringprojectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java index 0c80aa1abd..af28259644 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletehmackey/SyncDeleteHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletehmackey/SyncDeleteHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteHmacKey_StringString_sync] +// [START storage_v2_generated_storageclient_deletehmackey_stringstring_sync] import com.google.protobuf.Empty; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteHmacKey_StringString_sync] +// [END storage_v2_generated_storageclient_deletehmackey_stringstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java index 13375c27c8..9750969abe 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/AsyncDeleteNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/AsyncDeleteNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteNotification_async] +// [START storage_v2_generated_storageclient_deletenotification_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.DeleteNotificationRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteNotification_async] +// [END storage_v2_generated_storageclient_deletenotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java index eb16ccf746..61711276a6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteNotification_sync] +// [START storage_v2_generated_storageclient_deletenotification_sync] import com.google.protobuf.Empty; import com.google.storage.v2.DeleteNotificationRequest; import com.google.storage.v2.NotificationName; @@ -43,4 +43,4 @@ public static void syncDeleteNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteNotification_sync] +// [END storage_v2_generated_storageclient_deletenotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java index 2066a7f99b..997e2a981a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationNotificationname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationNotificationname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteNotification_Notificationname_sync] +// [START storage_v2_generated_storageclient_deletenotification_notificationname_sync] import com.google.protobuf.Empty; import com.google.storage.v2.NotificationName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteNotificationNotificationname() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteNotification_Notificationname_sync] +// [END storage_v2_generated_storageclient_deletenotification_notificationname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java index fdae07c684..fb4a6eb0f2 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deletenotification/SyncDeleteNotificationString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deletenotification/SyncDeleteNotificationString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteNotification_String_sync] +// [START storage_v2_generated_storageclient_deletenotification_string_sync] import com.google.protobuf.Empty; import com.google.storage.v2.NotificationName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteNotificationString() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteNotification_String_sync] +// [END storage_v2_generated_storageclient_deletenotification_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java index 714cd0468b..7a2be04630 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/AsyncDeleteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/AsyncDeleteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteObject_async] +// [START storage_v2_generated_storageclient_deleteobject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.Empty; import com.google.storage.v2.CommonObjectRequestParams; @@ -56,4 +56,4 @@ public static void asyncDeleteObject() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteObject_async] +// [END storage_v2_generated_storageclient_deleteobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java index 2256af68a9..7a75b1b37f 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteObject_sync] +// [START storage_v2_generated_storageclient_deleteobject_sync] import com.google.protobuf.Empty; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -53,4 +53,4 @@ public static void syncDeleteObject() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteObject_sync] +// [END storage_v2_generated_storageclient_deleteobject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java index 17f92a5fb8..71bd69ab79 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteObject_StringString_sync] +// [START storage_v2_generated_storageclient_deleteobject_stringstring_sync] import com.google.protobuf.Empty; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncDeleteObjectStringString() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteObject_StringString_sync] +// [END storage_v2_generated_storageclient_deleteobject_stringstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java index 96ece21926..95901e4bff 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/deleteobject/SyncDeleteObjectStringStringLong.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/deleteobject/SyncDeleteObjectStringStringLong.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_DeleteObject_StringStringLong_sync] +// [START storage_v2_generated_storageclient_deleteobject_stringstringlong_sync] import com.google.protobuf.Empty; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncDeleteObjectStringStringLong() throws Exception { } } } -// [END storage_v2_generated_Storage_DeleteObject_StringStringLong_sync] +// [END storage_v2_generated_storageclient_deleteobject_stringstringlong_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java index 3dcdced845..4ffc9d602a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetBucket_async] +// [START storage_v2_generated_storageclient_getbucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -52,4 +52,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_GetBucket_async] +// [END storage_v2_generated_storageclient_getbucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java index 7f538febb9..7041a17529 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetBucket_sync] +// [START storage_v2_generated_storageclient_getbucket_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; @@ -49,4 +49,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_GetBucket_sync] +// [END storage_v2_generated_storageclient_getbucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java index 4380dde62d..423ab72d7b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetBucket_Bucketname_sync] +// [START storage_v2_generated_storageclient_getbucket_bucketname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetBucketBucketname() throws Exception { } } } -// [END storage_v2_generated_Storage_GetBucket_Bucketname_sync] +// [END storage_v2_generated_storageclient_getbucket_bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java index b405ab5bf8..8c45b96b53 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getbucket/SyncGetBucketString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getbucket/SyncGetBucketString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetBucket_String_sync] +// [START storage_v2_generated_storageclient_getbucket_string_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetBucketString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetBucket_String_sync] +// [END storage_v2_generated_storageclient_getbucket_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java index 6296790f3a..496208daa2 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/AsyncGetHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/AsyncGetHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetHmacKey_async] +// [START storage_v2_generated_storageclient_gethmackey_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetHmacKeyRequest; @@ -49,4 +49,4 @@ public static void asyncGetHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_GetHmacKey_async] +// [END storage_v2_generated_storageclient_gethmackey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java index 3e10b16928..279f0db52c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetHmacKey_sync] +// [START storage_v2_generated_storageclient_gethmackey_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetHmacKeyRequest; import com.google.storage.v2.HmacKeyMetadata; @@ -46,4 +46,4 @@ public static void syncGetHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_GetHmacKey_sync] +// [END storage_v2_generated_storageclient_gethmackey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java index 1f9a3af72e..b301e0005a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetHmacKey_StringProjectname_sync] +// [START storage_v2_generated_storageclient_gethmackey_stringprojectname_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetHmacKeyStringProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_GetHmacKey_StringProjectname_sync] +// [END storage_v2_generated_storageclient_gethmackey_stringprojectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java index 2d474fe1f7..a83efed1ad 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/gethmackey/SyncGetHmacKeyStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/gethmackey/SyncGetHmacKeyStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetHmacKey_StringString_sync] +// [START storage_v2_generated_storageclient_gethmackey_stringstring_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetHmacKeyStringString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetHmacKey_StringString_sync] +// [END storage_v2_generated_storageclient_gethmackey_stringstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java index 3ad40f83e0..9ffab60de8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetIamPolicy_async] +// [START storage_v2_generated_storageclient_getiampolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -50,4 +50,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_GetIamPolicy_async] +// [END storage_v2_generated_storageclient_getiampolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java index 8afb23d68d..f6ef5b73fa 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetIamPolicy_sync] +// [START storage_v2_generated_storageclient_getiampolicy_sync] import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_GetIamPolicy_sync] +// [END storage_v2_generated_storageclient_getiampolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java index 7957b007f7..d8c2afdd95 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyResourcename.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyResourcename.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetIamPolicy_Resourcename_sync] +// [START storage_v2_generated_storageclient_getiampolicy_resourcename_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; @@ -41,4 +41,4 @@ public static void syncGetIamPolicyResourcename() throws Exception { } } } -// [END storage_v2_generated_Storage_GetIamPolicy_Resourcename_sync] +// [END storage_v2_generated_storageclient_getiampolicy_resourcename_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java index abf33118f1..df87a09e17 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getiampolicy/SyncGetIamPolicyString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getiampolicy/SyncGetIamPolicyString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetIamPolicy_String_sync] +// [START storage_v2_generated_storageclient_getiampolicy_string_sync] import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetIamPolicyString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetIamPolicy_String_sync] +// [END storage_v2_generated_storageclient_getiampolicy_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java index e435ab17d9..f836ad97b6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/AsyncGetNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/AsyncGetNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetNotification_async] +// [START storage_v2_generated_storageclient_getnotification_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.BucketName; import com.google.storage.v2.GetNotificationRequest; @@ -46,4 +46,4 @@ public static void asyncGetNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_GetNotification_async] +// [END storage_v2_generated_storageclient_getnotification_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java index cf7daa57e1..68baa46722 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotification.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotification.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetNotification_sync] +// [START storage_v2_generated_storageclient_getnotification_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.GetNotificationRequest; import com.google.storage.v2.Notification; @@ -43,4 +43,4 @@ public static void syncGetNotification() throws Exception { } } } -// [END storage_v2_generated_Storage_GetNotification_sync] +// [END storage_v2_generated_storageclient_getnotification_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java index c02279bd04..836c0fb469 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetNotification_Bucketname_sync] +// [START storage_v2_generated_storageclient_getnotification_bucketname_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.Notification; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetNotificationBucketname() throws Exception { } } } -// [END storage_v2_generated_Storage_GetNotification_Bucketname_sync] +// [END storage_v2_generated_storageclient_getnotification_bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java index c986a36bd9..d7bbf4beb9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getnotification/SyncGetNotificationString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getnotification/SyncGetNotificationString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetNotification_String_sync] +// [START storage_v2_generated_storageclient_getnotification_string_sync] import com.google.storage.v2.BucketName; import com.google.storage.v2.Notification; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetNotificationString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetNotification_String_sync] +// [END storage_v2_generated_storageclient_getnotification_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java index 7c9ec69f23..bb46a24b2e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/AsyncGetObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/AsyncGetObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetObject_async] +// [START storage_v2_generated_storageclient_getobject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -57,4 +57,4 @@ public static void asyncGetObject() throws Exception { } } } -// [END storage_v2_generated_Storage_GetObject_async] +// [END storage_v2_generated_storageclient_getobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java index 2df38b0411..ef07fe163d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetObject_sync] +// [START storage_v2_generated_storageclient_getobject_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -54,4 +54,4 @@ public static void syncGetObject() throws Exception { } } } -// [END storage_v2_generated_Storage_GetObject_sync] +// [END storage_v2_generated_storageclient_getobject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java index 055976559c..fd0bbefc1e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetObject_StringString_sync] +// [START storage_v2_generated_storageclient_getobject_stringstring_sync] import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetObjectStringString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetObject_StringString_sync] +// [END storage_v2_generated_storageclient_getobject_stringstring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java index d1b7872f9f..815106ef57 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getobject/SyncGetObjectStringStringLong.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getobject/SyncGetObjectStringStringLong.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetObject_StringStringLong_sync] +// [START storage_v2_generated_storageclient_getobject_stringstringlong_sync] import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncGetObjectStringStringLong() throws Exception { } } } -// [END storage_v2_generated_Storage_GetObject_StringStringLong_sync] +// [END storage_v2_generated_storageclient_getobject_stringstringlong_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java index 5a7bc7f5bd..f582fbccbf 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/AsyncGetServiceAccount.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/AsyncGetServiceAccount.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetServiceAccount_async] +// [START storage_v2_generated_storageclient_getserviceaccount_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetServiceAccountRequest; @@ -49,4 +49,4 @@ public static void asyncGetServiceAccount() throws Exception { } } } -// [END storage_v2_generated_Storage_GetServiceAccount_async] +// [END storage_v2_generated_storageclient_getserviceaccount_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java index ac6aa64809..0460911b38 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccount.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccount.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetServiceAccount_sync] +// [START storage_v2_generated_storageclient_getserviceaccount_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.GetServiceAccountRequest; import com.google.storage.v2.ProjectName; @@ -45,4 +45,4 @@ public static void syncGetServiceAccount() throws Exception { } } } -// [END storage_v2_generated_Storage_GetServiceAccount_sync] +// [END storage_v2_generated_storageclient_getserviceaccount_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java index 9c73fbfd80..55c604cec5 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetServiceAccount_Projectname_sync] +// [START storage_v2_generated_storageclient_getserviceaccount_projectname_sync] import com.google.storage.v2.ProjectName; import com.google.storage.v2.ServiceAccount; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetServiceAccountProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_GetServiceAccount_Projectname_sync] +// [END storage_v2_generated_storageclient_getserviceaccount_projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java index 366ed9739e..41643f50af 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/getserviceaccount/SyncGetServiceAccountString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/getserviceaccount/SyncGetServiceAccountString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_GetServiceAccount_String_sync] +// [START storage_v2_generated_storageclient_getserviceaccount_string_sync] import com.google.storage.v2.ProjectName; import com.google.storage.v2.ServiceAccount; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncGetServiceAccountString() throws Exception { } } } -// [END storage_v2_generated_Storage_GetServiceAccount_String_sync] +// [END storage_v2_generated_storageclient_getserviceaccount_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java index ee836eb681..d04519c59b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListBuckets_async] +// [START storage_v2_generated_storageclient_listbuckets_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -55,4 +55,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END storage_v2_generated_Storage_ListBuckets_async] +// [END storage_v2_generated_storageclient_listbuckets_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java index 50804dc510..adf9444d2d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListBuckets_Paged_async] +// [START storage_v2_generated_storageclient_listbuckets_paged_async] import com.google.common.base.Strings; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -63,4 +63,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END storage_v2_generated_Storage_ListBuckets_Paged_async] +// [END storage_v2_generated_storageclient_listbuckets_paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java index e8a5825092..53c374d5d3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListBuckets_sync] +// [START storage_v2_generated_storageclient_listbuckets_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.CommonRequestParams; @@ -52,4 +52,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END storage_v2_generated_Storage_ListBuckets_sync] +// [END storage_v2_generated_storageclient_listbuckets_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java index e9c9424c1a..603a1b7d05 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListBuckets_Projectname_sync] +// [START storage_v2_generated_storageclient_listbuckets_projectname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListBucketsProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_ListBuckets_Projectname_sync] +// [END storage_v2_generated_storageclient_listbuckets_projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java index 630f6bc297..e9aca45a50 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListBuckets_String_sync] +// [START storage_v2_generated_storageclient_listbuckets_string_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END storage_v2_generated_Storage_ListBuckets_String_sync] +// [END storage_v2_generated_storageclient_listbuckets_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java index 93a5d2848d..2880515eb3 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeys.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeys.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListHmacKeys_async] +// [START storage_v2_generated_storageclient_listhmackeys_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -55,4 +55,4 @@ public static void asyncListHmacKeys() throws Exception { } } } -// [END storage_v2_generated_Storage_ListHmacKeys_async] +// [END storage_v2_generated_storageclient_listhmackeys_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java index 4ab0838fb2..e65983b0e4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/AsyncListHmacKeysPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/AsyncListHmacKeysPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListHmacKeys_Paged_async] +// [START storage_v2_generated_storageclient_listhmackeys_paged_async] import com.google.common.base.Strings; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -62,4 +62,4 @@ public static void asyncListHmacKeysPaged() throws Exception { } } } -// [END storage_v2_generated_Storage_ListHmacKeys_Paged_async] +// [END storage_v2_generated_storageclient_listhmackeys_paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java index aa3911a12e..9eaf07bc4e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeys.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeys.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListHmacKeys_sync] +// [START storage_v2_generated_storageclient_listhmackeys_sync] import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ListHmacKeysRequest; @@ -51,4 +51,4 @@ public static void syncListHmacKeys() throws Exception { } } } -// [END storage_v2_generated_Storage_ListHmacKeys_sync] +// [END storage_v2_generated_storageclient_listhmackeys_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java index 4a4791ca22..672f339b41 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListHmacKeys_Projectname_sync] +// [START storage_v2_generated_storageclient_listhmackeys_projectname_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListHmacKeysProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_ListHmacKeys_Projectname_sync] +// [END storage_v2_generated_storageclient_listhmackeys_projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java index cc45b359b6..a5852cea5b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listhmackeys/SyncListHmacKeysString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listhmackeys/SyncListHmacKeysString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListHmacKeys_String_sync] +// [START storage_v2_generated_storageclient_listhmackeys_string_sync] import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListHmacKeysString() throws Exception { } } } -// [END storage_v2_generated_Storage_ListHmacKeys_String_sync] +// [END storage_v2_generated_storageclient_listhmackeys_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java index 24f3399182..a3e87303b1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotifications.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotifications.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListNotifications_async] +// [START storage_v2_generated_storageclient_listnotifications_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.Notification; @@ -51,4 +51,4 @@ public static void asyncListNotifications() throws Exception { } } } -// [END storage_v2_generated_Storage_ListNotifications_async] +// [END storage_v2_generated_storageclient_listnotifications_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java index 9f14a283b1..b7db1c172d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/AsyncListNotificationsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/AsyncListNotificationsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListNotifications_Paged_async] +// [START storage_v2_generated_storageclient_listnotifications_paged_async] import com.google.common.base.Strings; import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.ListNotificationsResponse; @@ -59,4 +59,4 @@ public static void asyncListNotificationsPaged() throws Exception { } } } -// [END storage_v2_generated_Storage_ListNotifications_Paged_async] +// [END storage_v2_generated_storageclient_listnotifications_paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java index 0ccd2eb0d3..65dabd0edb 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotifications.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotifications.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListNotifications_sync] +// [START storage_v2_generated_storageclient_listnotifications_sync] import com.google.storage.v2.ListNotificationsRequest; import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; @@ -47,4 +47,4 @@ public static void syncListNotifications() throws Exception { } } } -// [END storage_v2_generated_Storage_ListNotifications_sync] +// [END storage_v2_generated_storageclient_listnotifications_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java index d7ee513685..8b545ca5f4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListNotifications_Projectname_sync] +// [START storage_v2_generated_storageclient_listnotifications_projectname_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListNotificationsProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_ListNotifications_Projectname_sync] +// [END storage_v2_generated_storageclient_listnotifications_projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java index 34898b1a5c..10dc0ca3fc 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listnotifications/SyncListNotificationsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listnotifications/SyncListNotificationsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListNotifications_String_sync] +// [START storage_v2_generated_storageclient_listnotifications_string_sync] import com.google.storage.v2.Notification; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListNotificationsString() throws Exception { } } } -// [END storage_v2_generated_Storage_ListNotifications_String_sync] +// [END storage_v2_generated_storageclient_listnotifications_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java index b3dc4aab67..540d821a45 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjects.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjects.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListObjects_async] +// [START storage_v2_generated_storageclient_listobjects_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -60,4 +60,4 @@ public static void asyncListObjects() throws Exception { } } } -// [END storage_v2_generated_Storage_ListObjects_async] +// [END storage_v2_generated_storageclient_listobjects_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java index 52ec978572..38ab63055e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/AsyncListObjectsPaged.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/AsyncListObjectsPaged.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListObjects_Paged_async] +// [START storage_v2_generated_storageclient_listobjects_paged_async] import com.google.common.base.Strings; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -68,4 +68,4 @@ public static void asyncListObjectsPaged() throws Exception { } } } -// [END storage_v2_generated_Storage_ListObjects_Paged_async] +// [END storage_v2_generated_storageclient_listobjects_paged_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java index 0a7b1bf7c9..52ee085997 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjects.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjects.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListObjects_sync] +// [START storage_v2_generated_storageclient_listobjects_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.ListObjectsRequest; @@ -57,4 +57,4 @@ public static void syncListObjects() throws Exception { } } } -// [END storage_v2_generated_Storage_ListObjects_sync] +// [END storage_v2_generated_storageclient_listobjects_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java index ffeab2e800..d58a09ddd8 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsProjectname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsProjectname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListObjects_Projectname_sync] +// [START storage_v2_generated_storageclient_listobjects_projectname_sync] import com.google.storage.v2.Object; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListObjectsProjectname() throws Exception { } } } -// [END storage_v2_generated_Storage_ListObjects_Projectname_sync] +// [END storage_v2_generated_storageclient_listobjects_projectname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java index 07d0103f29..eb5365e3db 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/listobjects/SyncListObjectsString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/listobjects/SyncListObjectsString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ListObjects_String_sync] +// [START storage_v2_generated_storageclient_listobjects_string_sync] import com.google.storage.v2.Object; import com.google.storage.v2.ProjectName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncListObjectsString() throws Exception { } } } -// [END storage_v2_generated_Storage_ListObjects_String_sync] +// [END storage_v2_generated_storageclient_listobjects_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java index 0a03174d88..9e1629faf5 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/AsyncLockBucketRetentionPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_async] +// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; @@ -50,4 +50,4 @@ public static void asyncLockBucketRetentionPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_async] +// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java similarity index 92% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java index 47cfec99e8..ef748a5b05 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_sync] +// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonRequestParams; @@ -46,4 +46,4 @@ public static void syncLockBucketRetentionPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_sync] +// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java index 975b421c1f..34a49422c7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyBucketname.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_Bucketname_sync] +// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_bucketname_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncLockBucketRetentionPolicyBucketname() throws Exception { } } } -// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_Bucketname_sync] +// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_bucketname_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java index 9a368ae767..2a3a6a6d20 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/lockbucketretentionpolicy/SyncLockBucketRetentionPolicyString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_LockBucketRetentionPolicy_String_sync] +// [START storage_v2_generated_storageclient_lockbucketretentionpolicy_string_sync] import com.google.storage.v2.Bucket; import com.google.storage.v2.BucketName; import com.google.storage.v2.StorageClient; @@ -39,4 +39,4 @@ public static void syncLockBucketRetentionPolicyString() throws Exception { } } } -// [END storage_v2_generated_Storage_LockBucketRetentionPolicy_String_sync] +// [END storage_v2_generated_storageclient_lockbucketretentionpolicy_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java index 920ed5636d..77d3793d69 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/AsyncQueryWriteStatus.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/AsyncQueryWriteStatus.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_QueryWriteStatus_async] +// [START storage_v2_generated_storageclient_querywritestatus_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -50,4 +50,4 @@ public static void asyncQueryWriteStatus() throws Exception { } } } -// [END storage_v2_generated_Storage_QueryWriteStatus_async] +// [END storage_v2_generated_storageclient_querywritestatus_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java index c6ca964f02..1e9a839858 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatus.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatus.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_QueryWriteStatus_sync] +// [START storage_v2_generated_storageclient_querywritestatus_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.QueryWriteStatusRequest; @@ -46,4 +46,4 @@ public static void syncQueryWriteStatus() throws Exception { } } } -// [END storage_v2_generated_Storage_QueryWriteStatus_sync] +// [END storage_v2_generated_storageclient_querywritestatus_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java index edce608da6..8e893433d6 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/querywritestatus/SyncQueryWriteStatusString.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/querywritestatus/SyncQueryWriteStatusString.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_QueryWriteStatus_String_sync] +// [START storage_v2_generated_storageclient_querywritestatus_string_sync] import com.google.storage.v2.QueryWriteStatusResponse; import com.google.storage.v2.StorageClient; @@ -38,4 +38,4 @@ public static void syncQueryWriteStatusString() throws Exception { } } } -// [END storage_v2_generated_Storage_QueryWriteStatus_String_sync] +// [END storage_v2_generated_storageclient_querywritestatus_string_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java index 9c514c72f7..2c973e42a9 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/readobject/AsyncReadObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/readobject/AsyncReadObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_ReadObject_async] +// [START storage_v2_generated_storageclient_readobject_async] import com.google.api.gax.rpc.ServerStream; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -60,4 +60,4 @@ public static void asyncReadObject() throws Exception { } } } -// [END storage_v2_generated_Storage_ReadObject_async] +// [END storage_v2_generated_storageclient_readobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java similarity index 96% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java index a85b895d7f..299e85e484 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/AsyncRewriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/AsyncRewriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_RewriteObject_async] +// [START storage_v2_generated_storageclient_rewriteobject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.ByteString; import com.google.storage.v2.BucketName; @@ -76,4 +76,4 @@ public static void asyncRewriteObject() throws Exception { } } } -// [END storage_v2_generated_Storage_RewriteObject_async] +// [END storage_v2_generated_storageclient_rewriteobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java similarity index 96% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java index b51f59f440..18fb3abe11 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/rewriteobject/SyncRewriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/rewriteobject/SyncRewriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_RewriteObject_sync] +// [START storage_v2_generated_storageclient_rewriteobject_sync] import com.google.protobuf.ByteString; import com.google.storage.v2.BucketName; import com.google.storage.v2.CommonObjectRequestParams; @@ -73,4 +73,4 @@ public static void syncRewriteObject() throws Exception { } } } -// [END storage_v2_generated_Storage_RewriteObject_sync] +// [END storage_v2_generated_storageclient_rewriteobject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java index d4ee7afcc6..fcfef46b4e 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_SetIamPolicy_async] +// [START storage_v2_generated_storageclient_setiampolicy_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -49,4 +49,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_SetIamPolicy_async] +// [END storage_v2_generated_storageclient_setiampolicy_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java index 83ce240bc6..162a976b3a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_SetIamPolicy_sync] +// [START storage_v2_generated_storageclient_setiampolicy_sync] import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; import com.google.storage.v2.CryptoKeyName; @@ -46,4 +46,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_SetIamPolicy_sync] +// [END storage_v2_generated_storageclient_setiampolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java index b8c315d928..eeb939ee73 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyResourcenamePolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_SetIamPolicy_ResourcenamePolicy_sync] +// [START storage_v2_generated_storageclient_setiampolicy_resourcenamepolicy_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; @@ -42,4 +42,4 @@ public static void syncSetIamPolicyResourcenamePolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_SetIamPolicy_ResourcenamePolicy_sync] +// [END storage_v2_generated_storageclient_setiampolicy_resourcenamepolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java index 39e5e74725..7e952f016d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/setiampolicy/SyncSetIamPolicyStringPolicy.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/setiampolicy/SyncSetIamPolicyStringPolicy.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_SetIamPolicy_StringPolicy_sync] +// [START storage_v2_generated_storageclient_setiampolicy_stringpolicy_sync] import com.google.iam.v1.Policy; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -41,4 +41,4 @@ public static void syncSetIamPolicyStringPolicy() throws Exception { } } } -// [END storage_v2_generated_Storage_SetIamPolicy_StringPolicy_sync] +// [END storage_v2_generated_storageclient_setiampolicy_stringpolicy_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java index 6475b7054e..1fd68bad18 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/AsyncStartResumableWrite.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/AsyncStartResumableWrite.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_StartResumableWrite_async] +// [START storage_v2_generated_storageclient_startresumablewrite_async] import com.google.api.core.ApiFuture; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -51,4 +51,4 @@ public static void asyncStartResumableWrite() throws Exception { } } } -// [END storage_v2_generated_Storage_StartResumableWrite_async] +// [END storage_v2_generated_storageclient_startresumablewrite_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java index 3b707f8b52..e89e5828c4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/startresumablewrite/SyncStartResumableWrite.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/startresumablewrite/SyncStartResumableWrite.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_StartResumableWrite_sync] +// [START storage_v2_generated_storageclient_startresumablewrite_sync] import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.StartResumableWriteRequest; @@ -47,4 +47,4 @@ public static void syncStartResumableWrite() throws Exception { } } } -// [END storage_v2_generated_Storage_StartResumableWrite_sync] +// [END storage_v2_generated_storageclient_startresumablewrite_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java index c8eb1c9640..66726a9a22 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_TestIamPermissions_async] +// [START storage_v2_generated_storageclient_testiampermissions_async] import com.google.api.core.ApiFuture; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -51,4 +51,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END storage_v2_generated_Storage_TestIamPermissions_async] +// [END storage_v2_generated_storageclient_testiampermissions_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java index dae7ffbb49..f0b6301795 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_TestIamPermissions_sync] +// [START storage_v2_generated_storageclient_testiampermissions_sync] import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; @@ -47,4 +47,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END storage_v2_generated_Storage_TestIamPermissions_sync] +// [END storage_v2_generated_storageclient_testiampermissions_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java index fe6593f2b1..8e12e2e1b1 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_TestIamPermissions_ResourcenameListstring_sync] +// [START storage_v2_generated_storageclient_testiampermissions_resourcenameliststring_sync] import com.google.api.resourcenames.ResourceName; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; @@ -44,4 +44,4 @@ public static void syncTestIamPermissionsResourcenameListstring() throws Excepti } } } -// [END storage_v2_generated_Storage_TestIamPermissions_ResourcenameListstring_sync] +// [END storage_v2_generated_storageclient_testiampermissions_resourcenameliststring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java index 607b2ed2a4..b0c702d65d 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/testiampermissions/SyncTestIamPermissionsStringListstring.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/testiampermissions/SyncTestIamPermissionsStringListstring.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_TestIamPermissions_StringListstring_sync] +// [START storage_v2_generated_storageclient_testiampermissions_stringliststring_sync] import com.google.iam.v1.TestIamPermissionsResponse; import com.google.storage.v2.CryptoKeyName; import com.google.storage.v2.StorageClient; @@ -43,4 +43,4 @@ public static void syncTestIamPermissionsStringListstring() throws Exception { } } } -// [END storage_v2_generated_Storage_TestIamPermissions_StringListstring_sync] +// [END storage_v2_generated_storageclient_testiampermissions_stringliststring_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java index 0c093f5357..692e032a0c 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateBucket_async] +// [START storage_v2_generated_storageclient_updatebucket_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; @@ -55,4 +55,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateBucket_async] +// [END storage_v2_generated_storageclient_updatebucket_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java index af6de69a6a..2a4bf571f4 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateBucket_sync] +// [START storage_v2_generated_storageclient_updatebucket_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.CommonRequestParams; @@ -52,4 +52,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateBucket_sync] +// [END storage_v2_generated_storageclient_updatebucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java index def1e336a3..6155dfd464 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatebucket/SyncUpdateBucketBucketFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatebucket/SyncUpdateBucketBucketFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateBucket_BucketFieldmask_sync] +// [START storage_v2_generated_storageclient_updatebucket_bucketfieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Bucket; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateBucketBucketFieldmask() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateBucket_BucketFieldmask_sync] +// [END storage_v2_generated_storageclient_updatebucket_bucketfieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java index e64d3b00af..4d6bc6bf21 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/AsyncUpdateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/AsyncUpdateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateHmacKey_async] +// [START storage_v2_generated_storageclient_updatehmackey_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; @@ -49,4 +49,4 @@ public static void asyncUpdateHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateHmacKey_async] +// [END storage_v2_generated_storageclient_updatehmackey_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java similarity index 93% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java index 315cefd0cd..348190181b 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKey.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKey.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateHmacKey_sync] +// [START storage_v2_generated_storageclient_updatehmackey_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonRequestParams; import com.google.storage.v2.HmacKeyMetadata; @@ -46,4 +46,4 @@ public static void syncUpdateHmacKey() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateHmacKey_sync] +// [END storage_v2_generated_storageclient_updatehmackey_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java similarity index 90% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java index 188f04a358..8250c51372 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updatehmackey/SyncUpdateHmacKeyHmackeymetadataFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateHmacKey_HmackeymetadataFieldmask_sync] +// [START storage_v2_generated_storageclient_updatehmackey_hmackeymetadatafieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.HmacKeyMetadata; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateHmacKeyHmackeymetadataFieldmask() throws Exception } } } -// [END storage_v2_generated_Storage_UpdateHmacKey_HmackeymetadataFieldmask_sync] +// [END storage_v2_generated_storageclient_updatehmackey_hmackeymetadatafieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java index a91c083c6c..2d58d876e7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/AsyncUpdateObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/AsyncUpdateObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateObject_async] +// [START storage_v2_generated_storageclient_updateobject_async] import com.google.api.core.ApiFuture; import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; @@ -57,4 +57,4 @@ public static void asyncUpdateObject() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateObject_async] +// [END storage_v2_generated_storageclient_updateobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java similarity index 94% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java index e5dbbf698a..e754240336 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateObject_sync] +// [START storage_v2_generated_storageclient_updateobject_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -54,4 +54,4 @@ public static void syncUpdateObject() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateObject_sync] +// [END storage_v2_generated_storageclient_updateobject_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java similarity index 91% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java index c33865a01e..7e6d83d11a 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/updateobject/SyncUpdateObjectObjectFieldmask.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/updateobject/SyncUpdateObjectObjectFieldmask.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_UpdateObject_ObjectFieldmask_sync] +// [START storage_v2_generated_storageclient_updateobject_objectfieldmask_sync] import com.google.protobuf.FieldMask; import com.google.storage.v2.Object; import com.google.storage.v2.StorageClient; @@ -40,4 +40,4 @@ public static void syncUpdateObjectObjectFieldmask() throws Exception { } } } -// [END storage_v2_generated_Storage_UpdateObject_ObjectFieldmask_sync] +// [END storage_v2_generated_storageclient_updateobject_objectfieldmask_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java similarity index 95% rename from test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java rename to test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java index 15ab73a6aa..8ef622a7ea 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storage/writeobject/AsyncWriteObject.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storageclient/writeobject/AsyncWriteObject.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_Storage_WriteObject_async] +// [START storage_v2_generated_storageclient_writeobject_async] import com.google.api.gax.rpc.ApiStreamObserver; import com.google.storage.v2.CommonObjectRequestParams; import com.google.storage.v2.CommonRequestParams; @@ -69,4 +69,4 @@ public void onCompleted() { } } } -// [END storage_v2_generated_Storage_WriteObject_async] +// [END storage_v2_generated_storageclient_writeobject_async] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java index 22d518e905..064574c4d5 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/storagesettings/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.samples; -// [START storage_v2_generated_StorageSettings_DeleteBucket_sync] +// [START storage_v2_generated_storagesettings_deletebucket_sync] import com.google.storage.v2.StorageSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { StorageSettings storageSettings = storageSettingsBuilder.build(); } } -// [END storage_v2_generated_StorageSettings_DeleteBucket_sync] +// [END storage_v2_generated_storagesettings_deletebucket_sync] diff --git a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java index 73a1bc3c2b..4ac8cb2ed7 100644 --- a/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/storage/samples/snippets/generated/main/java/com/google/storage/v2/stub/storagestubsettings/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.storage.v2.stub.samples; -// [START storage_v2_generated_StorageStubSettings_DeleteBucket_sync] +// [START storage_v2_generated_storagestubsettings_deletebucket_sync] import com.google.storage.v2.stub.StorageStubSettings; import java.time.Duration; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { StorageStubSettings storageSettings = storageSettingsBuilder.build(); } } -// [END storage_v2_generated_StorageStubSettings_DeleteBucket_sync] +// [END storage_v2_generated_storagestubsettings_deletebucket_sync] diff --git a/version.txt b/version.txt index 5f4f65c859..10c2c0c3d6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.10.3 +2.10.0 From 9c8c6386efbe8b9eaef64e82ace8d143ba24d15f Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 3 Nov 2022 14:23:45 -0400 Subject: [PATCH 068/103] test: update golden files after merging annotations import fix from main --- .../spring/composer/goldens/EchoSpringAutoConfiguration.golden | 1 + .../composer/goldens/EchoSpringAutoConfigurationFull.golden | 1 + .../spring/composer/goldens/EchoSpringProperties.golden | 1 + .../spring/composer/goldens/EchoSpringPropertiesFull.golden | 1 + 4 files changed, 4 insertions(+) diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index 6800a70f8c..7b71d337b7 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -11,6 +11,7 @@ import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 25df0158b4..b3258c0daf 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -29,6 +29,7 @@ import java.io.IOException; import javax.annotation.Generated; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden index 5fe2406751..05d848fe26 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -3,6 +3,7 @@ package com.google.showcase.v1beta1.spring; import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index c0a5400e7e..4d3ab98065 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -21,6 +21,7 @@ import com.google.cloud.spring.core.Credentials; import com.google.cloud.spring.core.CredentialsSupplier; import javax.annotation.Generated; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; @Generated("by gapic-generator-java") From 38459cc0a8cc37430ad5159a3719e7c8c1ff60e2 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Thu, 3 Nov 2022 16:22:31 -0400 Subject: [PATCH 069/103] feat(comment): autoconfig gen draft2 javadoc2 (#1060) * feat(SpringGen): adding extra annotations at the `SpringComposer` step for all Spring classes generated (#1062) this pr: - adds a @BetaApi annotation for each class composed in SpringComposer - also moves the @Generated("by gapic-generator-java") annotation to SpringComposer for consistency. (this annotation was missing for the properties class composer.) - Updating annotations in SpringComposer level for the ones that applies to all classes makes it easier for future changes when needed. * fix(test): remove wrong files from rebase action * fix(format): linting * fix(license): add license header to prop comm comp * fix(test): restore ComposerTest * fix: format files Co-authored-by: Min Zhu --- .../SpringAutoConfigClassComposer.java | 16 ++- .../SpringPropertiesClassComposer.java | 4 + .../SpringAutoconfigCommentComposer.java | 106 ++++++++++++++++++ .../SpringPropertiesCommentComposer.java | 37 ++++++ .../EchoSpringAutoConfiguration.golden | 32 ++++++ .../EchoSpringAutoConfigurationFull.golden | 32 ++++++ .../goldens/EchoSpringProperties.golden | 2 + .../goldens/EchoSpringPropertiesFull.golden | 2 + 8 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java create mode 100644 src/main/java/com/google/api/generator/spring/composer/comment/SpringPropertiesCommentComposer.java diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index b45d858bb3..952d79335e 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -48,6 +48,7 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.spring.composer.comment.SpringAutoconfigCommentComposer; import com.google.api.generator.spring.utils.LoggerUtils; import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; @@ -100,6 +101,8 @@ public GapicClass generate(GapicContext context, Service service) { .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) + .setHeaderCommentStatements( + SpringAutoconfigCommentComposer.createClassHeaderComments(className, serviceName)) .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) .setMethods( Arrays.asList( @@ -331,6 +334,8 @@ private static MethodDefinition createCredentialsProviderBeanMethod( return MethodDefinition.builder() .setName(methodName) + .setHeaderCommentStatements( + SpringAutoconfigCommentComposer.createCredentialsProviderBeanComment()) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("CredentialsProvider")) .setAnnotations( @@ -359,6 +364,8 @@ private static MethodDefinition createTransportChannelProviderBeanMethod( .build(); return MethodDefinition.builder() + .setHeaderCommentStatements( + SpringAutoconfigCommentComposer.createTransportChannelProviderComment()) .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(STATIC_TYPES.get("TransportChannelProvider")) @@ -780,8 +787,15 @@ private static MethodDefinition createClientBeanMethod( .setArguments(serviceSettingsBuilt) .build(); + String methodName = + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; + String propertiesClassName = service.name() + "Properties"; + return MethodDefinition.builder() - .setName(clientName) + .setHeaderCommentStatements( + SpringAutoconfigCommentComposer.createClientBeanComment( + service.name(), propertiesClassName, transportChannelProviderName)) + .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) .setArguments( diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 00c1c3557f..618f6f933b 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -41,6 +41,7 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.spring.composer.comment.SpringPropertiesCommentComposer; import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; @@ -80,6 +81,9 @@ public GapicClass generate(GapicContext context, Service service) { ClassDefinition classDef = ClassDefinition.builder() + .setHeaderCommentStatements( + SpringPropertiesCommentComposer.createClassHeaderComments( + className, service.name())) .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) diff --git a/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java new file mode 100644 index 0000000000..171ae79909 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java @@ -0,0 +1,106 @@ +// 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.spring.composer.comment; + +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.JavaDocComment; +import com.google.api.generator.gapic.composer.comment.CommentComposer; +import com.google.common.base.CaseFormat; +import java.util.Arrays; +import java.util.List; + +public class SpringAutoconfigCommentComposer { + + private static final String CLASS_HEADER_SUMMARY_PATTERN = + "Auto-configuration for {@link %sClient}."; + private static final String CLASS_HEADER_GENERAL_DESCRIPTION = + "Provides auto-configuration for Spring Boot"; + private static final String CLASS_HEADER_DEFAULTS_DESCRIPTION = + "The default instance has everything set to sensible defaults:"; + private static final String CLASS_HEADER_DEFAULTS_CREDENTIALS_DESCRIPTION = + "Credentials are acquired automatically through Application Default Credentials."; + private static final String CLASS_HEADER_DEFAULTS_TRANSPORT_DESCRIPTION = + "The default transport provider is used."; + private static final String CLASS_HEADER_DEFAULTS_RETRIES_DESCRIPTION = + "Retries are configured for idempotent methods but not for non-idempotent methods."; + + public static final String CREDENTIALS_PROVIDER_GENERAL_DESCRIPTION = + "Obtains the default credentials provider. The used key will be obtained from Spring Boot " + + "configuration data files."; + + public static final String TRANSPORT_CHANNEL_PROVIDER_GENERAL_DESCRIPTION = + "Returns the default channel provider. The default is gRPC and will default to it unless the " + + "useRest option is provided to use HTTP transport instead"; + public static final String CLIENT_BEAN_GENERAL_DESCRIPTION = + "Provides a %sClient bean configured to " + + "use the default credentials provider (obtained with %sCredentials()) and its default " + + "transport channel provider (%s()). It also configures the quota project ID if provided. It " + + "will configure an executor provider in case there is more than one thread configured " + + "in the client "; + + public static final String CLIENT_BEAN_RETRY_SETTINGS_DESCRIPTION = + "Individual retry settings " + + "are configured as well. It will use the relevant client library's default retry " + + "settings when they are not specified in %s."; + + public SpringAutoconfigCommentComposer() {} + + public static List createClassHeaderComments( + String configuredClassName, String serviceName) { + + JavaDocComment.Builder javaDocCommentBuilder = + JavaDocComment.builder() + .addUnescapedComment(String.format(CLASS_HEADER_SUMMARY_PATTERN, serviceName)) + .addParagraph(CLASS_HEADER_GENERAL_DESCRIPTION) + .addParagraph(CLASS_HEADER_DEFAULTS_DESCRIPTION) + .addUnorderedList( + Arrays.asList( + CLASS_HEADER_DEFAULTS_TRANSPORT_DESCRIPTION, + CLASS_HEADER_DEFAULTS_CREDENTIALS_DESCRIPTION, + CLASS_HEADER_DEFAULTS_RETRIES_DESCRIPTION)); + + return Arrays.asList( + CommentComposer.AUTO_GENERATED_CLASS_COMMENT, + CommentStatement.withComment(javaDocCommentBuilder.build())); + } + + public static CommentStatement createCredentialsProviderBeanComment() { + return CommentStatement.withComment( + JavaDocComment.builder().addParagraph(CREDENTIALS_PROVIDER_GENERAL_DESCRIPTION).build()); + } + + public static CommentStatement createTransportChannelProviderComment() { + return CommentStatement.withComment( + JavaDocComment.builder() + .addParagraph(TRANSPORT_CHANNEL_PROVIDER_GENERAL_DESCRIPTION) + .build()); + } + + public static CommentStatement createClientBeanComment( + String serviceName, String propertiesClazzName, String channelProviderName) { + String credentialsBaseName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); + return CommentStatement.withComment( + JavaDocComment.builder() + .addParagraph( + String.format( + CLIENT_BEAN_GENERAL_DESCRIPTION, + serviceName, + credentialsBaseName, + channelProviderName)) + .addParagraph( + String.format(CLIENT_BEAN_RETRY_SETTINGS_DESCRIPTION, propertiesClazzName)) + .build()); + } +} diff --git a/src/main/java/com/google/api/generator/spring/composer/comment/SpringPropertiesCommentComposer.java b/src/main/java/com/google/api/generator/spring/composer/comment/SpringPropertiesCommentComposer.java new file mode 100644 index 0000000000..6d05240eea --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/composer/comment/SpringPropertiesCommentComposer.java @@ -0,0 +1,37 @@ +// 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.spring.composer.comment; + +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.JavaDocComment; +import com.google.api.generator.gapic.composer.comment.CommentComposer; +import java.util.Arrays; +import java.util.List; + +public class SpringPropertiesCommentComposer { + private static final String CLASS_HEADER_GENERAL_DESCRIPTION = + "Provides default property values for %s client bean"; + + public static List createClassHeaderComments( + String configuredClassName, String serviceName) { + + JavaDocComment.Builder javaDocCommentBuilder = + JavaDocComment.builder() + .addParagraph(String.format(CLASS_HEADER_GENERAL_DESCRIPTION, serviceName)); + return Arrays.asList( + CommentComposer.AUTO_GENERATED_CLASS_COMMENT, + CommentStatement.withComment(javaDocCommentBuilder.build())); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden index 7b71d337b7..e25e7ec599 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden @@ -20,6 +20,20 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.threeten.bp.Duration; +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Auto-configuration for {@link EchoClient}. + * + *

Provides auto-configuration for Spring Boot + * + *

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

    + *
  • The default transport provider is used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ */ @AutoConfiguration @ConditionalOnClass(EchoClient.class) @ConditionalOnProperty( @@ -34,18 +48,36 @@ public class EchoSpringAutoConfiguration { this.clientProperties = clientProperties; } + /** + * Obtains the default credentials provider. The used key will be obtained from Spring Boot + * configuration data files. + */ @Bean @ConditionalOnMissingBean public CredentialsProvider echoCredentials() throws IOException { return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); } + /** + * Returns the default channel provider. The default is gRPC and will default to it unless the + * useRest option is provided to use HTTP transport instead + */ @Bean @ConditionalOnMissingBean public TransportChannelProvider defaultEchoTransportChannelProvider() { return EchoSettings.defaultTransportChannelProvider(); } + /** + * Provides a EchoClient bean configured to use the default credentials provider (obtained with + * echoCredentials()) and its default transport channel provider + * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. + * It will configure an executor provider in case there is more than one thread configured in the + * client + * + *

Individual retry settings are configured as well. It will use the relevant client library's + * default retry settings when they are not specified in EchoProperties. + */ @Bean @ConditionalOnMissingBean public EchoClient echoClient( diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index b3258c0daf..274d5ff95a 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -38,6 +38,20 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.threeten.bp.Duration; +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Auto-configuration for {@link EchoClient}. + * + *

Provides auto-configuration for Spring Boot + * + *

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

    + *
  • The default transport provider is used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ */ @Generated("by gapic-generator-java") @BetaApi("Autogenerated Spring autoconfiguration is not yet stable") @AutoConfiguration @@ -54,18 +68,36 @@ public class EchoSpringAutoConfiguration { this.clientProperties = clientProperties; } + /** + * Obtains the default credentials provider. The used key will be obtained from Spring Boot + * configuration data files. + */ @Bean @ConditionalOnMissingBean public CredentialsProvider echoCredentials() throws IOException { return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); } + /** + * Returns the default channel provider. The default is gRPC and will default to it unless the + * useRest option is provided to use HTTP transport instead + */ @Bean @ConditionalOnMissingBean public TransportChannelProvider defaultEchoTransportChannelProvider() { return EchoSettings.defaultTransportChannelProvider(); } + /** + * Provides a EchoClient bean configured to use the default credentials provider (obtained with + * echoCredentials()) and its default transport channel provider + * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. + * It will configure an executor provider in case there is more than one thread configured in the + * client + * + *

Individual retry settings are configured as well. It will use the relevant client library's + * default retry settings when they are not specified in EchoProperties. + */ @Bean @ConditionalOnMissingBean public EchoClient echoClient( diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden index 05d848fe26..b7ca9ebe01 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden @@ -6,6 +6,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** Provides default property values for Echo client bean */ @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") public class EchoSpringProperties implements CredentialsSupplier { @NestedConfigurationProperty diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index 4d3ab98065..d53b691bde 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -24,6 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.threeten.bp.Duration; +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** Provides default property values for Echo client bean */ @Generated("by gapic-generator-java") @BetaApi("Autogenerated Spring autoconfiguration is not yet stable") @ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") From 5fb9091704343f6efc8b43c923e625789d85b515 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 7 Nov 2022 17:20:36 -0500 Subject: [PATCH 070/103] fix(Spring CodeGen): To only include options to set to rest transport when supported (#1078) As per earlier discussions, `defaultHttpJsonTransportProvider` is only applicable when Transport.REST_GRPC (e.g. in case of [java_vision](https://github.com/googleapis/googleapis/blob/master/google/cloud/vision/v1/BUILD.bazel#L86)). In this change: - if Transport.GRPC: do not provide property `useRest` to override TransportProvider, use default `defaultTransportChannelProvider()`. - if Transport.REST_GRPC: by default, set `useRest = false` and use default settings same as above. But override to `defaultHttpJsonTransportProvider` when property `useRest` is set to `true`. - In both cases, keep `TransportChannelProvider` bean. This bean defaults to `defaultTransportChannelProvider()`, but allows advanced users to override in user application (e.g. to [set a proxy](https://github.com/googleapis/google-cloud-java#configuring-a-proxy)) --- .../SpringAutoConfigClassComposer.java | 148 +++--- .../spring/composer/SpringComposer.java | 1 + .../SpringPropertiesClassComposer.java | 61 ++- .../SpringAutoConfigClassComposerTest.java | 16 +- .../SpringPropertiesClassComposerTest.java | 15 +- .../EchoSpringAutoConfigurationFull.golden | 6 - .../EchoSpringAutoConfigurationGrpc.golden | 430 +++++++++++++++ ...choSpringAutoConfigurationGrpcRest.golden} | 0 .../goldens/EchoSpringPropertiesFull.golden | 5 - ...golden => EchoSpringPropertiesGrpc.golden} | 5 - .../EchoSpringPropertiesGrpcRest.golden | 491 ++++++++++++++++++ 11 files changed, 1062 insertions(+), 116 deletions(-) create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden rename src/test/java/com/google/api/generator/spring/composer/goldens/{EchoSpringAutoConfiguration.golden => EchoSpringAutoConfigurationGrpcRest.golden} (100%) rename src/test/java/com/google/api/generator/spring/composer/goldens/{EchoSpringProperties.golden => EchoSpringPropertiesGrpc.golden} (99%) create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 952d79335e..5af37202d9 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -48,6 +48,7 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.spring.composer.comment.SpringAutoconfigCommentComposer; import com.google.api.generator.spring.utils.LoggerUtils; import com.google.api.generator.spring.utils.Utils; @@ -96,6 +97,9 @@ public GapicClass generate(GapicContext context, Service service) { types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); + Transport transport = context.transport(); + boolean hasRestOption = transport.equals(Transport.GRPC_REST); + ClassDefinition classDef = ClassDefinition.builder() .setPackageString(packageName) @@ -104,6 +108,7 @@ public GapicClass generate(GapicContext context, Service service) { .setHeaderCommentStatements( SpringAutoconfigCommentComposer.createClassHeaderComments(className, serviceName)) .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) + .setAnnotations(createClassAnnotations(service, types)) .setMethods( Arrays.asList( createConstructor(service.name(), className, types), @@ -118,9 +123,10 @@ public GapicClass generate(GapicContext context, Service service) { transportChannelProviderName, clientName, types, - gapicServiceConfig))) - .setAnnotations(createClassAnnotations(service, types)) + gapicServiceConfig, + hasRestOption))) .build(); + return GapicClass.create(kind, classDef); } @@ -465,7 +471,8 @@ private static MethodDefinition createClientBeanMethod( String transportChannelProviderName, String clientName, Map types, - GapicServiceConfig gapicServiceConfig) { + GapicServiceConfig gapicServiceConfig, + boolean hasRestOption) { // argument variables: VariableExpr credentialsProviderVariableExpr = VariableExpr.withVariable( @@ -513,6 +520,7 @@ private static MethodDefinition createClientBeanMethod( .setMethodName("setTransportChannelProvider") .setArguments(transportChannelProviderVariableExpr) .build(); + // .setHeaderProvider( // new UserAgentHeaderProvider(this.getClass())); settingsBuilderExpr = @@ -654,50 +662,51 @@ private static MethodDefinition createClientBeanMethod( bodyStatements.add(setBackgroundExecutorProviderStatement); - // if (clientProperties.getUseRest()) { - // clientSettingsBuilder.setTransportChannelProvider( - // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); - // } - - MethodInvocationExpr getUseRest = - MethodInvocationExpr.builder() - .setMethodName("getUseRest") - .setReturnType(TypeNode.BOOLEAN) - .setExprReferenceExpr(thisClientPropertiesVarExpr) - .build(); - - // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build() - Expr defaultTransportProviderBuider = - MethodInvocationExpr.builder() - .setStaticReferenceType(types.get("ServiceSettings")) - .setMethodName("defaultHttpJsonTransportProviderBuilder") - .build(); - defaultTransportProviderBuider = - MethodInvocationExpr.builder() - .setExprReferenceExpr(defaultTransportProviderBuider) - .setMethodName("build") - .setReturnType(STATIC_TYPES.get("InstantiatingHttpJsonChannelProvider")) - .build(); - - MethodInvocationExpr setTransportProvider = - MethodInvocationExpr.builder() - .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) - .setMethodName("setTransportChannelProvider") - .setArguments(defaultTransportProviderBuider) - .build(); - IfStatement setTransportChannelProviderStatement = - createIfStatement( - getUseRest, - Arrays.asList( - ExprStatement.withExpr(setTransportProvider), - LoggerUtils.createLoggerStatement( - ValueExpr.withValue( - StringObjectValue.withValue("Using HTTP transport channel")), - types)), - null); - - bodyStatements.add(setTransportChannelProviderStatement); - + if (hasRestOption) { + // if (clientProperties.getUseRest()) { + // clientSettingsBuilder.setTransportChannelProvider( + // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build()); + // } + + MethodInvocationExpr getUseRest = + MethodInvocationExpr.builder() + .setMethodName("getUseRest") + .setReturnType(TypeNode.BOOLEAN) + .setExprReferenceExpr(thisClientPropertiesVarExpr) + .build(); + + // LanguageServiceSettings.defaultHttpJsonTransportProviderBuilder().build() + Expr defaultTransportProviderExprChain = + MethodInvocationExpr.builder() + .setStaticReferenceType(types.get("ServiceSettings")) + .setMethodName("defaultHttpJsonTransportProviderBuilder") + .build(); + defaultTransportProviderExprChain = + MethodInvocationExpr.builder() + .setExprReferenceExpr(defaultTransportProviderExprChain) + .setMethodName("build") + .setReturnType(STATIC_TYPES.get("InstantiatingHttpJsonChannelProvider")) + .build(); + + MethodInvocationExpr setTransportProvider = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(settingBuilderVariable)) + .setMethodName("setTransportChannelProvider") + .setArguments(defaultTransportProviderExprChain) + .build(); + IfStatement setTransportChannelProviderStatement = + createIfStatement( + getUseRest, + Arrays.asList( + ExprStatement.withExpr(setTransportProvider), + LoggerUtils.createLoggerStatement( + ValueExpr.withValue( + StringObjectValue.withValue("Using HTTP transport channel")), + types)), + null); + + bodyStatements.add(setTransportChannelProviderStatement); + } // retry settings for each method TypeNode thisClassType = types.get(service.name() + "AutoConfig"); List retrySettings = @@ -786,6 +795,28 @@ private static MethodDefinition createClientBeanMethod( .setReturnType(types.get("ServiceClient")) .setArguments(serviceSettingsBuilt) .build(); + List argumentsVariableExprs = + Arrays.asList( + credentialsProviderVariableExpr + .toBuilder() + .setIsDecl(true) + .setAnnotations( + Arrays.asList( + AnnotationNode.builder() + .setType(types.get("Qualifier")) + .setDescription(credentialsProviderName) + .build())) + .build(), + transportChannelProviderVariableExpr + .toBuilder() + .setIsDecl(true) + .setAnnotations( + Arrays.asList( + AnnotationNode.builder() + .setType(types.get("Qualifier")) + .setDescription(transportChannelProviderName) + .build())) + .build()); String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; @@ -798,28 +829,7 @@ private static MethodDefinition createClientBeanMethod( .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) - .setArguments( - Arrays.asList( - credentialsProviderVariableExpr - .toBuilder() - .setIsDecl(true) - .setAnnotations( - Arrays.asList( - AnnotationNode.builder() - .setType(types.get("Qualifier")) - .setDescription(credentialsProviderName) - .build())) - .build(), - transportChannelProviderVariableExpr - .toBuilder() - .setIsDecl(true) - .setAnnotations( - Arrays.asList( - AnnotationNode.builder() - .setType(types.get("Qualifier")) - .setDescription(transportChannelProviderName) - .build())) - .build())) + .setArguments(argumentsVariableExprs) .setAnnotations( Arrays.asList( AnnotationNode.withType(types.get("Bean")), diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java index b9f92c1f52..b255d1c05c 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java @@ -51,6 +51,7 @@ protected static List generatePerServiceClasses(GapicContext context .services() .forEach( s -> { + // Transport.REST is out of scope for Spring composers. if (context.transport() == Transport.GRPC || context.transport() == Transport.GRPC_REST) { clazzes.add(SpringAutoConfigClassComposer.instance().generate(context, s)); diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 618f6f933b..685830d7f8 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -26,6 +26,7 @@ import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.StringObjectValue; @@ -41,6 +42,7 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.model.Transport; import com.google.api.generator.spring.composer.comment.SpringPropertiesCommentComposer; import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; @@ -70,6 +72,7 @@ public GapicClass generate(GapicContext context, Service service) { String className = String.format(CLASS_NAME_PATTERN, service.name()); GapicServiceConfig gapicServiceConfig = context.serviceConfig(); Map types = createDynamicTypes(service, packageName); + boolean hasRestOption = context.transport().equals(Transport.GRPC_REST); // TODO: this is the prefix user will use to set properties, may need to change depending on // branding. @@ -87,8 +90,10 @@ public GapicClass generate(GapicContext context, Service service) { .setPackageString(packageName) .setName(className) .setScope(ScopeNode.PUBLIC) - .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig)) - .setMethods(createGetterSetters(service, types, gapicServiceConfig)) + .setStatements( + createMemberVariables( + service, packageName, types, gapicServiceConfig, hasRestOption)) + .setMethods(createGetterSetters(service, types, gapicServiceConfig, hasRestOption)) .setAnnotations(Arrays.asList(classAnnotationNode)) .setImplementsTypes(Arrays.asList(types.get("CredentialsSupplier"))) .build(); @@ -129,9 +134,11 @@ private static List createMemberVariables( Service service, String packageName, Map types, - GapicServiceConfig serviceConfig) { + GapicServiceConfig serviceConfig, + boolean hasRestOption) { String serviceName = service.name(); + List statements = new ArrayList<>(); // @NestedConfigurationProperty // private final Credentials credentials = new // Credentials("https://www.googleapis.com/auth/cloud-language"); @@ -155,20 +162,27 @@ private static List createMemberVariables( true, defaultCredentialScopes, credentialsAnnotations); - + statements.add(credentialsStatement); // private String quotaProjectId; ExprStatement quotaProjectIdVarStatement = createMemberVarStatement("quotaProjectId", TypeNode.STRING, false, null, null); - + statements.add(quotaProjectIdVarStatement); // private Integer executorThreadCount; ExprStatement executorThreadCountVarStatement = createMemberVarStatement("executorThreadCount", TypeNode.INT_OBJECT, false, null, null); + statements.add(executorThreadCountVarStatement); + if (hasRestOption) { + ExprStatement useRestVarStatement = + createMemberVarStatement( + "useRest", + TypeNode.BOOLEAN, + false, + ValueExpr.withValue( + PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("false").build()), + null); + statements.add(useRestVarStatement); + } - // private boolean useRest = false; - ExprStatement useRestVarStatement = - createMemberVarStatement("useRest", TypeNode.BOOLEAN, false, null, null); - - // // private static final ImmutableMap RETRY_PARAM_DEFINITIONS; // declare each retry settings with its default value. use defaults from serviceConfig @@ -194,18 +208,17 @@ private static List createMemberVariables( }, (String propertyName) -> new ArrayList<>()); - List statements = - retrySettings.stream().map(x -> (Statement) x).collect(Collectors.toList()); + statements.addAll( + retrySettings.stream().map(Statement.class::cast).collect(Collectors.toList())); - statements.add(0, useRestVarStatement); - statements.add(0, executorThreadCountVarStatement); - statements.add(0, quotaProjectIdVarStatement); - statements.add(0, credentialsStatement); return statements; } private static List createGetterSetters( - Service service, Map types, GapicServiceConfig gapicServiceConfig) { + Service service, + Map types, + GapicServiceConfig gapicServiceConfig, + boolean hasRestOption) { TypeNode thisClassType = types.get(service.name() + "Properties"); List methodDefinitions = new ArrayList<>(); @@ -219,7 +232,10 @@ private static List createGetterSetters( methodDefinitions.add( createGetterMethod(thisClassType, "quotaProjectId", TypeNode.STRING, null)); methodDefinitions.add(createSetterMethod(thisClassType, "quotaProjectId", TypeNode.STRING)); - methodDefinitions.add(createGetterMethod(thisClassType, "useRest", TypeNode.BOOLEAN, null)); + if (hasRestOption) { + methodDefinitions.add(createGetterMethod(thisClassType, "useRest", TypeNode.BOOLEAN, null)); + methodDefinitions.add(createSetterMethod(thisClassType, "useRest", TypeNode.BOOLEAN)); + } methodDefinitions.add( createGetterMethod(thisClassType, "executorThreadCount", TypeNode.INT_OBJECT, null)); methodDefinitions.add( @@ -246,15 +262,6 @@ private static List createGetterSetters( (String propertyName) -> new ArrayList<>()); methodDefinitions.addAll(retrySettings); - // TODO: This can be for future stages. for long running operations: - // for (Method method : service.methods()) { - // if (!method.hasLro()) { - // continue; - // } - // // - // com.google.api.generator.gapic.composer.common.RetrySettingsComposer.createLroSettingsBuilderExpr - // // %sOperationSettings - // } return methodDefinitions; } diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java index 64f93c5df2..7ee9904fe1 100644 --- a/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java @@ -18,6 +18,7 @@ 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.gapic.model.Transport; import com.google.api.generator.test.framework.Assert; import org.junit.Before; import org.junit.Test; @@ -33,10 +34,21 @@ public void setUp() { } @Test - public void generateAutoConfigClazzTest() { + public void generateAutoConfigClazzGrpcTest() { GapicClass clazz = SpringAutoConfigClassComposer.instance().generate(this.context, this.echoProtoService); - String fileName = clazz.classDefinition().classIdentifier() + ".golden"; + String fileName = clazz.classDefinition().classIdentifier() + "Grpc.golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } + + @Test + public void generateAutoConfigClazzGrpcRestTest() { + + GapicContext contextGrpcRest = + this.context.toBuilder().setTransport(Transport.GRPC_REST).build(); + GapicClass clazz = + SpringAutoConfigClassComposer.instance().generate(contextGrpcRest, this.echoProtoService); + String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden"; Assert.assertGoldenClass(this.getClass(), clazz, fileName); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java index f19298c067..356f976e0b 100644 --- a/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java @@ -18,6 +18,7 @@ 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.gapic.model.Transport; import com.google.api.generator.test.framework.Assert; import org.junit.Before; import org.junit.Test; @@ -33,10 +34,20 @@ public void setUp() { } @Test - public void generateAutoConfigClazzTest() { + public void generatePropertiesClazzGrpcTest() { GapicClass clazz = SpringPropertiesClassComposer.instance().generate(this.context, this.echoProtoService); - String fileName = clazz.classDefinition().classIdentifier() + ".golden"; + String fileName = clazz.classDefinition().classIdentifier() + "Grpc.golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } + + @Test + public void generatePropertiesClazzGrpcRestTest() { + GapicContext contextGrpcRest = + this.context.toBuilder().setTransport(Transport.GRPC_REST).build(); + GapicClass clazz = + SpringPropertiesClassComposer.instance().generate(contextGrpcRest, this.echoProtoService); + String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden"; Assert.assertGoldenClass(this.getClass(), clazz, fileName); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 274d5ff95a..15c1d4c6f9 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -19,7 +19,6 @@ package com.google.showcase.v1beta1.spring; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; -import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.spring.core.DefaultCredentialsProvider; @@ -126,11 +125,6 @@ public class EchoSpringAutoConfiguration { LOGGER.info( "Background executor thread count is " + this.clientProperties.getExecutorThreadCount()); } - if (this.clientProperties.getUseRest()) { - clientSettingsBuilder.setTransportChannelProvider( - EchoSettings.defaultHttpJsonTransportProviderBuilder().build()); - LOGGER.info("Using HTTP transport channel"); - } RetrySettings.Builder echoRetrySettingBuilder = clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); if (this.clientProperties.getEchoInitialRetryDelay() != null) { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden new file mode 100644 index 0000000000..cad5a2bc75 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -0,0 +1,430 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.api.gax.core.CredentialsProvider; +import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.cloud.spring.core.DefaultCredentialsProvider; +import com.google.showcase.v1beta1.EchoClient; +import com.google.showcase.v1beta1.EchoSettings; +import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.threeten.bp.Duration; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Auto-configuration for {@link EchoClient}. + * + *

Provides auto-configuration for Spring Boot + * + *

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

    + *
  • The default transport provider is used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ */ +@AutoConfiguration +@ConditionalOnClass(EchoClient.class) +@ConditionalOnProperty( + value = "com.google.showcase.v1beta1.spring.auto.echo.enabled", + matchIfMissing = false) +@EnableConfigurationProperties(EchoSpringProperties.class) +public class EchoSpringAutoConfiguration { + private final EchoSpringProperties clientProperties; + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); + + protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { + this.clientProperties = clientProperties; + } + + /** + * Obtains the default credentials provider. The used key will be obtained from Spring Boot + * configuration data files. + */ + @Bean + @ConditionalOnMissingBean + public CredentialsProvider echoCredentials() throws IOException { + return ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); + } + + /** + * Returns the default channel provider. The default is gRPC and will default to it unless the + * useRest option is provided to use HTTP transport instead + */ + @Bean + @ConditionalOnMissingBean + public TransportChannelProvider defaultEchoTransportChannelProvider() { + return EchoSettings.defaultTransportChannelProvider(); + } + + /** + * Provides a EchoClient bean configured to use the default credentials provider (obtained with + * echoCredentials()) and its default transport channel provider + * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. + * It will configure an executor provider in case there is more than one thread configured in the + * client + * + *

Individual retry settings are configured as well. It will use the relevant client library's + * default retry settings when they are not specified in EchoProperties. + */ + @Bean + @ConditionalOnMissingBean + public EchoClient echoClient( + @Qualifier("echoCredentials") CredentialsProvider credentialsProvider, + @Qualifier("defaultEchoTransportChannelProvider") + TransportChannelProvider defaultTransportChannelProvider) + throws IOException { + EchoSettings.Builder clientSettingsBuilder = + EchoSettings.newBuilder() + .setCredentialsProvider(credentialsProvider) + .setTransportChannelProvider(defaultTransportChannelProvider) + .setHeaderProvider(); + if (this.clientProperties.getQuotaProjectId() != null) { + clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + LOGGER.info( + "Quota project id set to " + + this.clientProperties.getQuotaProjectId() + + ", this overrides project id from credentials."); + } + if (this.clientProperties.getExecutorThreadCount() != null) { + ExecutorProvider executorProvider = + EchoSettings.defaultExecutorProviderBuilder() + .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) + .build(); + clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + LOGGER.info( + "Background executor thread count is " + this.clientProperties.getExecutorThreadCount()); + } + RetrySettings.Builder echoRetrySettingBuilder = + clientSettingsBuilder.echoSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getEchoInitialRetryDelay() != null) { + echoRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getEchoInitialRetryDelay()); + LOGGER.info( + "EchoInitialRetryDelay set to " + this.clientProperties.getEchoInitialRetryDelay()); + } + if (this.clientProperties.getEchoRetryDelayMultiplier() != null) { + echoRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getEchoRetryDelayMultiplier()); + LOGGER.info( + "EchoRetryDelayMultiplier set to " + this.clientProperties.getEchoRetryDelayMultiplier()); + } + if (this.clientProperties.getEchoMaxRetryDelay() != null) { + echoRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getEchoMaxRetryDelay()); + LOGGER.info("EchoMaxRetryDelay set to " + this.clientProperties.getEchoMaxRetryDelay()); + } + if (this.clientProperties.getEchoInitialRpcTimeout() != null) { + echoRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getEchoInitialRpcTimeout()); + LOGGER.info( + "EchoInitialRpcTimeout set to " + this.clientProperties.getEchoInitialRpcTimeout()); + } + if (this.clientProperties.getEchoRpcTimeoutMultiplier() != null) { + echoRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getEchoRpcTimeoutMultiplier()); + LOGGER.info( + "EchoRpcTimeoutMultiplier set to " + this.clientProperties.getEchoRpcTimeoutMultiplier()); + } + if (this.clientProperties.getEchoMaxRpcTimeout() != null) { + echoRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getEchoMaxRpcTimeout()); + LOGGER.info("EchoMaxRpcTimeout set to " + this.clientProperties.getEchoMaxRpcTimeout()); + } + if (this.clientProperties.getEchoTotalTimeout() != null) { + echoRetrySettingBuilder.setTotalTimeout(this.clientProperties.getEchoTotalTimeout()); + LOGGER.info("EchoTotalTimeout set to " + this.clientProperties.getEchoTotalTimeout()); + } + clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettingBuilder.build()); + RetrySettings.Builder expandRetrySettingBuilder = + clientSettingsBuilder.expandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getExpandInitialRetryDelay() != null) { + expandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getExpandInitialRetryDelay()); + LOGGER.info( + "ExpandInitialRetryDelay set to " + this.clientProperties.getExpandInitialRetryDelay()); + } + if (this.clientProperties.getExpandRetryDelayMultiplier() != null) { + expandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getExpandRetryDelayMultiplier()); + LOGGER.info( + "ExpandRetryDelayMultiplier set to " + + this.clientProperties.getExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getExpandMaxRetryDelay() != null) { + expandRetrySettingBuilder.setMaxRetryDelay(this.clientProperties.getExpandMaxRetryDelay()); + LOGGER.info("ExpandMaxRetryDelay set to " + this.clientProperties.getExpandMaxRetryDelay()); + } + if (this.clientProperties.getExpandInitialRpcTimeout() != null) { + expandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getExpandInitialRpcTimeout()); + LOGGER.info( + "ExpandInitialRpcTimeout set to " + this.clientProperties.getExpandInitialRpcTimeout()); + } + if (this.clientProperties.getExpandRpcTimeoutMultiplier() != null) { + expandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getExpandRpcTimeoutMultiplier()); + LOGGER.info( + "ExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getExpandMaxRpcTimeout() != null) { + expandRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getExpandMaxRpcTimeout()); + LOGGER.info("ExpandMaxRpcTimeout set to " + this.clientProperties.getExpandMaxRpcTimeout()); + } + if (this.clientProperties.getExpandTotalTimeout() != null) { + expandRetrySettingBuilder.setTotalTimeout(this.clientProperties.getExpandTotalTimeout()); + LOGGER.info("ExpandTotalTimeout set to " + this.clientProperties.getExpandTotalTimeout()); + } + clientSettingsBuilder.expandSettings().setRetrySettings(expandRetrySettingBuilder.build()); + RetrySettings.Builder collectRetrySettingBuilder = + clientSettingsBuilder.collectSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollectInitialRpcTimeout() != null) { + collectRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollectInitialRpcTimeout()); + LOGGER.info( + "CollectInitialRpcTimeout set to " + this.clientProperties.getCollectInitialRpcTimeout()); + } + if (this.clientProperties.getCollectRpcTimeoutMultiplier() != null) { + collectRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollectRpcTimeoutMultiplier()); + LOGGER.info( + "CollectRpcTimeoutMultiplier set to " + + this.clientProperties.getCollectRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollectMaxRpcTimeout() != null) { + collectRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getCollectMaxRpcTimeout()); + LOGGER.info("CollectMaxRpcTimeout set to " + this.clientProperties.getCollectMaxRpcTimeout()); + } + if (this.clientProperties.getCollectTotalTimeout() != null) { + collectRetrySettingBuilder.setTotalTimeout(this.clientProperties.getCollectTotalTimeout()); + LOGGER.info("CollectTotalTimeout set to " + this.clientProperties.getCollectTotalTimeout()); + } + clientSettingsBuilder.collectSettings().setRetrySettings(collectRetrySettingBuilder.build()); + RetrySettings.Builder chatRetrySettingBuilder = + clientSettingsBuilder.chatSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatInitialRpcTimeout() != null) { + chatRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatInitialRpcTimeout()); + LOGGER.info( + "ChatInitialRpcTimeout set to " + this.clientProperties.getChatInitialRpcTimeout()); + } + if (this.clientProperties.getChatRpcTimeoutMultiplier() != null) { + chatRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatRpcTimeoutMultiplier()); + LOGGER.info( + "ChatRpcTimeoutMultiplier set to " + this.clientProperties.getChatRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatMaxRpcTimeout() != null) { + chatRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getChatMaxRpcTimeout()); + LOGGER.info("ChatMaxRpcTimeout set to " + this.clientProperties.getChatMaxRpcTimeout()); + } + if (this.clientProperties.getChatTotalTimeout() != null) { + chatRetrySettingBuilder.setTotalTimeout(this.clientProperties.getChatTotalTimeout()); + LOGGER.info("ChatTotalTimeout set to " + this.clientProperties.getChatTotalTimeout()); + } + clientSettingsBuilder.chatSettings().setRetrySettings(chatRetrySettingBuilder.build()); + RetrySettings.Builder chatAgainRetrySettingBuilder = + clientSettingsBuilder.chatAgainSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getChatAgainInitialRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getChatAgainInitialRpcTimeout()); + LOGGER.info( + "ChatAgainInitialRpcTimeout set to " + + this.clientProperties.getChatAgainInitialRpcTimeout()); + } + if (this.clientProperties.getChatAgainRpcTimeoutMultiplier() != null) { + chatAgainRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + LOGGER.info( + "ChatAgainRpcTimeoutMultiplier set to " + + this.clientProperties.getChatAgainRpcTimeoutMultiplier()); + } + if (this.clientProperties.getChatAgainMaxRpcTimeout() != null) { + chatAgainRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getChatAgainMaxRpcTimeout()); + LOGGER.info( + "ChatAgainMaxRpcTimeout set to " + this.clientProperties.getChatAgainMaxRpcTimeout()); + } + if (this.clientProperties.getChatAgainTotalTimeout() != null) { + chatAgainRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getChatAgainTotalTimeout()); + LOGGER.info( + "ChatAgainTotalTimeout set to " + this.clientProperties.getChatAgainTotalTimeout()); + } + clientSettingsBuilder + .chatAgainSettings() + .setRetrySettings(chatAgainRetrySettingBuilder.build()); + RetrySettings.Builder pagedExpandRetrySettingBuilder = + clientSettingsBuilder.pagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getPagedExpandInitialRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setInitialRetryDelay( + this.clientProperties.getPagedExpandInitialRetryDelay()); + LOGGER.info( + "PagedExpandInitialRetryDelay set to " + + this.clientProperties.getPagedExpandInitialRetryDelay()); + } + if (this.clientProperties.getPagedExpandRetryDelayMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRetryDelayMultiplier( + this.clientProperties.getPagedExpandRetryDelayMultiplier()); + LOGGER.info( + "PagedExpandRetryDelayMultiplier set to " + + this.clientProperties.getPagedExpandRetryDelayMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRetryDelay() != null) { + pagedExpandRetrySettingBuilder.setMaxRetryDelay( + this.clientProperties.getPagedExpandMaxRetryDelay()); + LOGGER.info( + "PagedExpandMaxRetryDelay set to " + this.clientProperties.getPagedExpandMaxRetryDelay()); + } + if (this.clientProperties.getPagedExpandInitialRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getPagedExpandInitialRpcTimeout()); + LOGGER.info( + "PagedExpandInitialRpcTimeout set to " + + this.clientProperties.getPagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getPagedExpandRpcTimeoutMultiplier() != null) { + pagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "PagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getPagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getPagedExpandMaxRpcTimeout() != null) { + pagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getPagedExpandMaxRpcTimeout()); + LOGGER.info( + "PagedExpandMaxRpcTimeout set to " + this.clientProperties.getPagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getPagedExpandTotalTimeout() != null) { + pagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getPagedExpandTotalTimeout()); + LOGGER.info( + "PagedExpandTotalTimeout set to " + this.clientProperties.getPagedExpandTotalTimeout()); + } + clientSettingsBuilder + .pagedExpandSettings() + .setRetrySettings(pagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder simplePagedExpandRetrySettingBuilder = + clientSettingsBuilder.simplePagedExpandSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getSimplePagedExpandInitialRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + LOGGER.info( + "SimplePagedExpandInitialRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandInitialRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier() != null) { + simplePagedExpandRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + LOGGER.info( + "SimplePagedExpandRpcTimeoutMultiplier set to " + + this.clientProperties.getSimplePagedExpandRpcTimeoutMultiplier()); + } + if (this.clientProperties.getSimplePagedExpandMaxRpcTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + LOGGER.info( + "SimplePagedExpandMaxRpcTimeout set to " + + this.clientProperties.getSimplePagedExpandMaxRpcTimeout()); + } + if (this.clientProperties.getSimplePagedExpandTotalTimeout() != null) { + simplePagedExpandRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getSimplePagedExpandTotalTimeout()); + LOGGER.info( + "SimplePagedExpandTotalTimeout set to " + + this.clientProperties.getSimplePagedExpandTotalTimeout()); + } + clientSettingsBuilder + .simplePagedExpandSettings() + .setRetrySettings(simplePagedExpandRetrySettingBuilder.build()); + RetrySettings.Builder waitRetrySettingBuilder = + clientSettingsBuilder.waitSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getWaitInitialRpcTimeout() != null) { + waitRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getWaitInitialRpcTimeout()); + LOGGER.info( + "WaitInitialRpcTimeout set to " + this.clientProperties.getWaitInitialRpcTimeout()); + } + if (this.clientProperties.getWaitRpcTimeoutMultiplier() != null) { + waitRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getWaitRpcTimeoutMultiplier()); + LOGGER.info( + "WaitRpcTimeoutMultiplier set to " + this.clientProperties.getWaitRpcTimeoutMultiplier()); + } + if (this.clientProperties.getWaitMaxRpcTimeout() != null) { + waitRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getWaitMaxRpcTimeout()); + LOGGER.info("WaitMaxRpcTimeout set to " + this.clientProperties.getWaitMaxRpcTimeout()); + } + if (this.clientProperties.getWaitTotalTimeout() != null) { + waitRetrySettingBuilder.setTotalTimeout(this.clientProperties.getWaitTotalTimeout()); + LOGGER.info("WaitTotalTimeout set to " + this.clientProperties.getWaitTotalTimeout()); + } + clientSettingsBuilder.waitSettings().setRetrySettings(waitRetrySettingBuilder.build()); + RetrySettings.Builder blockRetrySettingBuilder = + clientSettingsBuilder.blockSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getBlockInitialRpcTimeout() != null) { + blockRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getBlockInitialRpcTimeout()); + LOGGER.info( + "BlockInitialRpcTimeout set to " + this.clientProperties.getBlockInitialRpcTimeout()); + } + if (this.clientProperties.getBlockRpcTimeoutMultiplier() != null) { + blockRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getBlockRpcTimeoutMultiplier()); + LOGGER.info( + "BlockRpcTimeoutMultiplier set to " + + this.clientProperties.getBlockRpcTimeoutMultiplier()); + } + if (this.clientProperties.getBlockMaxRpcTimeout() != null) { + blockRetrySettingBuilder.setMaxRpcTimeout(this.clientProperties.getBlockMaxRpcTimeout()); + LOGGER.info("BlockMaxRpcTimeout set to " + this.clientProperties.getBlockMaxRpcTimeout()); + } + if (this.clientProperties.getBlockTotalTimeout() != null) { + blockRetrySettingBuilder.setTotalTimeout(this.clientProperties.getBlockTotalTimeout()); + LOGGER.info("BlockTotalTimeout set to " + this.clientProperties.getBlockTotalTimeout()); + } + clientSettingsBuilder.blockSettings().setRetrySettings(blockRetrySettingBuilder.build()); + RetrySettings.Builder collideNameRetrySettingBuilder = + clientSettingsBuilder.collideNameSettings().getRetrySettings().toBuilder(); + if (this.clientProperties.getCollideNameInitialRpcTimeout() != null) { + collideNameRetrySettingBuilder.setInitialRpcTimeout( + this.clientProperties.getCollideNameInitialRpcTimeout()); + LOGGER.info( + "CollideNameInitialRpcTimeout set to " + + this.clientProperties.getCollideNameInitialRpcTimeout()); + } + if (this.clientProperties.getCollideNameRpcTimeoutMultiplier() != null) { + collideNameRetrySettingBuilder.setRpcTimeoutMultiplier( + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + LOGGER.info( + "CollideNameRpcTimeoutMultiplier set to " + + this.clientProperties.getCollideNameRpcTimeoutMultiplier()); + } + if (this.clientProperties.getCollideNameMaxRpcTimeout() != null) { + collideNameRetrySettingBuilder.setMaxRpcTimeout( + this.clientProperties.getCollideNameMaxRpcTimeout()); + LOGGER.info( + "CollideNameMaxRpcTimeout set to " + this.clientProperties.getCollideNameMaxRpcTimeout()); + } + if (this.clientProperties.getCollideNameTotalTimeout() != null) { + collideNameRetrySettingBuilder.setTotalTimeout( + this.clientProperties.getCollideNameTotalTimeout()); + LOGGER.info( + "CollideNameTotalTimeout set to " + this.clientProperties.getCollideNameTotalTimeout()); + } + clientSettingsBuilder + .collideNameSettings() + .setRetrySettings(collideNameRetrySettingBuilder.build()); + return EchoClient.create(clientSettingsBuilder.build()); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden similarity index 100% rename from src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfiguration.golden rename to src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index d53b691bde..f568eef8db 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -36,7 +36,6 @@ public class EchoSpringProperties implements CredentialsSupplier { private String quotaProjectId; private Integer executorThreadCount; - private boolean useRest; private Duration echoInitialRetryDelay; private Double echoRetryDelayMultiplier; private Duration echoMaxRetryDelay; @@ -100,10 +99,6 @@ public class EchoSpringProperties implements CredentialsSupplier { this.quotaProjectId = quotaProjectId; } - public boolean getUseRest() { - return this.useRest; - } - public Integer getExecutorThreadCount() { return this.executorThreadCount; } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden similarity index 99% rename from src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden rename to src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden index b7ca9ebe01..3767554993 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringProperties.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden @@ -16,7 +16,6 @@ public class EchoSpringProperties implements CredentialsSupplier { private String quotaProjectId; private Integer executorThreadCount; - private boolean useRest; private Duration echoInitialRetryDelay; private Double echoRetryDelayMultiplier; private Duration echoMaxRetryDelay; @@ -80,10 +79,6 @@ public class EchoSpringProperties implements CredentialsSupplier { this.quotaProjectId = quotaProjectId; } - public boolean getUseRest() { - return this.useRest; - } - public Integer getExecutorThreadCount() { return this.executorThreadCount; } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden new file mode 100644 index 0000000000..55d8a0f23c --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden @@ -0,0 +1,491 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.CredentialsSupplier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; +import org.threeten.bp.Duration; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** Provides default property values for Echo client bean */ +@ConfigurationProperties("com.google.showcase.v1beta1.spring.auto.echo") +public class EchoSpringProperties implements CredentialsSupplier { + @NestedConfigurationProperty + private final Credentials credentials = + new Credentials("https://www.googleapis.com/auth/cloud-platform"); + + private String quotaProjectId; + private Integer executorThreadCount; + private boolean useRest = false; + private Duration echoInitialRetryDelay; + private Double echoRetryDelayMultiplier; + private Duration echoMaxRetryDelay; + private Duration echoInitialRpcTimeout; + private Double echoRpcTimeoutMultiplier; + private Duration echoMaxRpcTimeout; + private Duration echoTotalTimeout; + private Duration expandInitialRetryDelay; + private Double expandRetryDelayMultiplier; + private Duration expandMaxRetryDelay; + private Duration expandInitialRpcTimeout; + private Double expandRpcTimeoutMultiplier; + private Duration expandMaxRpcTimeout; + private Duration expandTotalTimeout; + private Duration collectInitialRpcTimeout; + private Double collectRpcTimeoutMultiplier; + private Duration collectMaxRpcTimeout; + private Duration collectTotalTimeout; + private Duration chatInitialRpcTimeout; + private Double chatRpcTimeoutMultiplier; + private Duration chatMaxRpcTimeout; + private Duration chatTotalTimeout; + private Duration chatAgainInitialRpcTimeout; + private Double chatAgainRpcTimeoutMultiplier; + private Duration chatAgainMaxRpcTimeout; + private Duration chatAgainTotalTimeout; + private Duration pagedExpandInitialRetryDelay; + private Double pagedExpandRetryDelayMultiplier; + private Duration pagedExpandMaxRetryDelay; + private Duration pagedExpandInitialRpcTimeout; + private Double pagedExpandRpcTimeoutMultiplier; + private Duration pagedExpandMaxRpcTimeout; + private Duration pagedExpandTotalTimeout; + private Duration simplePagedExpandInitialRpcTimeout; + private Double simplePagedExpandRpcTimeoutMultiplier; + private Duration simplePagedExpandMaxRpcTimeout; + private Duration simplePagedExpandTotalTimeout; + private Duration waitInitialRpcTimeout; + private Double waitRpcTimeoutMultiplier; + private Duration waitMaxRpcTimeout; + private Duration waitTotalTimeout; + private Duration blockInitialRpcTimeout; + private Double blockRpcTimeoutMultiplier; + private Duration blockMaxRpcTimeout; + private Duration blockTotalTimeout; + private Duration collideNameInitialRpcTimeout; + private Double collideNameRpcTimeoutMultiplier; + private Duration collideNameMaxRpcTimeout; + private Duration collideNameTotalTimeout; + + @Override + public Credentials getCredentials() { + return this.credentials; + } + + public String getQuotaProjectId() { + return this.quotaProjectId; + } + + public void setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; + } + + public boolean getUseRest() { + return this.useRest; + } + + public void setUseRest(boolean useRest) { + this.useRest = useRest; + } + + public Integer getExecutorThreadCount() { + return this.executorThreadCount; + } + + public void setExecutorThreadCount(Integer executorThreadCount) { + this.executorThreadCount = executorThreadCount; + } + + public Duration getEchoInitialRetryDelay() { + return this.echoInitialRetryDelay; + } + + public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = echoInitialRetryDelay; + } + + public Double getEchoRetryDelayMultiplier() { + return this.echoRetryDelayMultiplier; + } + + public void setEchoRetryDelayMultiplier(Double echoRetryDelayMultiplier) { + this.echoRetryDelayMultiplier = echoRetryDelayMultiplier; + } + + public Duration getEchoMaxRetryDelay() { + return this.echoMaxRetryDelay; + } + + public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = echoMaxRetryDelay; + } + + public Duration getEchoInitialRpcTimeout() { + return this.echoInitialRpcTimeout; + } + + public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = echoInitialRpcTimeout; + } + + public Double getEchoRpcTimeoutMultiplier() { + return this.echoRpcTimeoutMultiplier; + } + + public void setEchoRpcTimeoutMultiplier(Double echoRpcTimeoutMultiplier) { + this.echoRpcTimeoutMultiplier = echoRpcTimeoutMultiplier; + } + + public Duration getEchoMaxRpcTimeout() { + return this.echoMaxRpcTimeout; + } + + public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = echoMaxRpcTimeout; + } + + public Duration getEchoTotalTimeout() { + return this.echoTotalTimeout; + } + + public void setEchoTotalTimeout(Duration echoTotalTimeout) { + this.echoTotalTimeout = echoTotalTimeout; + } + + public Duration getExpandInitialRetryDelay() { + return this.expandInitialRetryDelay; + } + + public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = expandInitialRetryDelay; + } + + public Double getExpandRetryDelayMultiplier() { + return this.expandRetryDelayMultiplier; + } + + public void setExpandRetryDelayMultiplier(Double expandRetryDelayMultiplier) { + this.expandRetryDelayMultiplier = expandRetryDelayMultiplier; + } + + public Duration getExpandMaxRetryDelay() { + return this.expandMaxRetryDelay; + } + + public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = expandMaxRetryDelay; + } + + public Duration getExpandInitialRpcTimeout() { + return this.expandInitialRpcTimeout; + } + + public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = expandInitialRpcTimeout; + } + + public Double getExpandRpcTimeoutMultiplier() { + return this.expandRpcTimeoutMultiplier; + } + + public void setExpandRpcTimeoutMultiplier(Double expandRpcTimeoutMultiplier) { + this.expandRpcTimeoutMultiplier = expandRpcTimeoutMultiplier; + } + + public Duration getExpandMaxRpcTimeout() { + return this.expandMaxRpcTimeout; + } + + public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = expandMaxRpcTimeout; + } + + public Duration getExpandTotalTimeout() { + return this.expandTotalTimeout; + } + + public void setExpandTotalTimeout(Duration expandTotalTimeout) { + this.expandTotalTimeout = expandTotalTimeout; + } + + public Duration getCollectInitialRpcTimeout() { + return this.collectInitialRpcTimeout; + } + + public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = collectInitialRpcTimeout; + } + + public Double getCollectRpcTimeoutMultiplier() { + return this.collectRpcTimeoutMultiplier; + } + + public void setCollectRpcTimeoutMultiplier(Double collectRpcTimeoutMultiplier) { + this.collectRpcTimeoutMultiplier = collectRpcTimeoutMultiplier; + } + + public Duration getCollectMaxRpcTimeout() { + return this.collectMaxRpcTimeout; + } + + public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = collectMaxRpcTimeout; + } + + public Duration getCollectTotalTimeout() { + return this.collectTotalTimeout; + } + + public void setCollectTotalTimeout(Duration collectTotalTimeout) { + this.collectTotalTimeout = collectTotalTimeout; + } + + public Duration getChatInitialRpcTimeout() { + return this.chatInitialRpcTimeout; + } + + public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = chatInitialRpcTimeout; + } + + public Double getChatRpcTimeoutMultiplier() { + return this.chatRpcTimeoutMultiplier; + } + + public void setChatRpcTimeoutMultiplier(Double chatRpcTimeoutMultiplier) { + this.chatRpcTimeoutMultiplier = chatRpcTimeoutMultiplier; + } + + public Duration getChatMaxRpcTimeout() { + return this.chatMaxRpcTimeout; + } + + public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = chatMaxRpcTimeout; + } + + public Duration getChatTotalTimeout() { + return this.chatTotalTimeout; + } + + public void setChatTotalTimeout(Duration chatTotalTimeout) { + this.chatTotalTimeout = chatTotalTimeout; + } + + public Duration getChatAgainInitialRpcTimeout() { + return this.chatAgainInitialRpcTimeout; + } + + public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + } + + public Double getChatAgainRpcTimeoutMultiplier() { + return this.chatAgainRpcTimeoutMultiplier; + } + + public void setChatAgainRpcTimeoutMultiplier(Double chatAgainRpcTimeoutMultiplier) { + this.chatAgainRpcTimeoutMultiplier = chatAgainRpcTimeoutMultiplier; + } + + public Duration getChatAgainMaxRpcTimeout() { + return this.chatAgainMaxRpcTimeout; + } + + public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + } + + public Duration getChatAgainTotalTimeout() { + return this.chatAgainTotalTimeout; + } + + public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = chatAgainTotalTimeout; + } + + public Duration getPagedExpandInitialRetryDelay() { + return this.pagedExpandInitialRetryDelay; + } + + public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + } + + public Double getPagedExpandRetryDelayMultiplier() { + return this.pagedExpandRetryDelayMultiplier; + } + + public void setPagedExpandRetryDelayMultiplier(Double pagedExpandRetryDelayMultiplier) { + this.pagedExpandRetryDelayMultiplier = pagedExpandRetryDelayMultiplier; + } + + public Duration getPagedExpandMaxRetryDelay() { + return this.pagedExpandMaxRetryDelay; + } + + public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + } + + public Duration getPagedExpandInitialRpcTimeout() { + return this.pagedExpandInitialRpcTimeout; + } + + public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + } + + public Double getPagedExpandRpcTimeoutMultiplier() { + return this.pagedExpandRpcTimeoutMultiplier; + } + + public void setPagedExpandRpcTimeoutMultiplier(Double pagedExpandRpcTimeoutMultiplier) { + this.pagedExpandRpcTimeoutMultiplier = pagedExpandRpcTimeoutMultiplier; + } + + public Duration getPagedExpandMaxRpcTimeout() { + return this.pagedExpandMaxRpcTimeout; + } + + public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + } + + public Duration getPagedExpandTotalTimeout() { + return this.pagedExpandTotalTimeout; + } + + public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + } + + public Duration getSimplePagedExpandInitialRpcTimeout() { + return this.simplePagedExpandInitialRpcTimeout; + } + + public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + } + + public Double getSimplePagedExpandRpcTimeoutMultiplier() { + return this.simplePagedExpandRpcTimeoutMultiplier; + } + + public void setSimplePagedExpandRpcTimeoutMultiplier( + Double simplePagedExpandRpcTimeoutMultiplier) { + this.simplePagedExpandRpcTimeoutMultiplier = simplePagedExpandRpcTimeoutMultiplier; + } + + public Duration getSimplePagedExpandMaxRpcTimeout() { + return this.simplePagedExpandMaxRpcTimeout; + } + + public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + } + + public Duration getSimplePagedExpandTotalTimeout() { + return this.simplePagedExpandTotalTimeout; + } + + public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + } + + public Duration getWaitInitialRpcTimeout() { + return this.waitInitialRpcTimeout; + } + + public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = waitInitialRpcTimeout; + } + + public Double getWaitRpcTimeoutMultiplier() { + return this.waitRpcTimeoutMultiplier; + } + + public void setWaitRpcTimeoutMultiplier(Double waitRpcTimeoutMultiplier) { + this.waitRpcTimeoutMultiplier = waitRpcTimeoutMultiplier; + } + + public Duration getWaitMaxRpcTimeout() { + return this.waitMaxRpcTimeout; + } + + public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = waitMaxRpcTimeout; + } + + public Duration getWaitTotalTimeout() { + return this.waitTotalTimeout; + } + + public void setWaitTotalTimeout(Duration waitTotalTimeout) { + this.waitTotalTimeout = waitTotalTimeout; + } + + public Duration getBlockInitialRpcTimeout() { + return this.blockInitialRpcTimeout; + } + + public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = blockInitialRpcTimeout; + } + + public Double getBlockRpcTimeoutMultiplier() { + return this.blockRpcTimeoutMultiplier; + } + + public void setBlockRpcTimeoutMultiplier(Double blockRpcTimeoutMultiplier) { + this.blockRpcTimeoutMultiplier = blockRpcTimeoutMultiplier; + } + + public Duration getBlockMaxRpcTimeout() { + return this.blockMaxRpcTimeout; + } + + public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = blockMaxRpcTimeout; + } + + public Duration getBlockTotalTimeout() { + return this.blockTotalTimeout; + } + + public void setBlockTotalTimeout(Duration blockTotalTimeout) { + this.blockTotalTimeout = blockTotalTimeout; + } + + public Duration getCollideNameInitialRpcTimeout() { + return this.collideNameInitialRpcTimeout; + } + + public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + } + + public Double getCollideNameRpcTimeoutMultiplier() { + return this.collideNameRpcTimeoutMultiplier; + } + + public void setCollideNameRpcTimeoutMultiplier(Double collideNameRpcTimeoutMultiplier) { + this.collideNameRpcTimeoutMultiplier = collideNameRpcTimeoutMultiplier; + } + + public Duration getCollideNameMaxRpcTimeout() { + return this.collideNameMaxRpcTimeout; + } + + public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + } + + public Duration getCollideNameTotalTimeout() { + return this.collideNameTotalTimeout; + } + + public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = collideNameTotalTimeout; + } +} From 5f637cc909125d49e42b01eb292b7b8241df1ec7 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Wed, 9 Nov 2022 09:09:06 -0500 Subject: [PATCH 071/103] fix(spring): use parsed api shortname as libname (#1084) * Switches getLibName() to use apiShortName parsed from default host, and updates golden files. --- .../com/google/api/generator/spring/utils/Utils.java | 11 +++++------ .../spring/composer/goldens/SpringPackageInfo.golden | 2 +- .../composer/goldens/SpringPackageInfoFull.golden | 2 +- .../goldens/SpringAdditionalMetadataJson.golden | 2 +- .../generator/spring/goldens/SpringPackagePom.golden | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index dea2b743f3..ce02532b84 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -28,7 +28,6 @@ import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; -import com.google.common.base.Splitter; import com.google.protobuf.Duration; import com.google.protobuf.util.Durations; import io.grpc.serviceconfig.MethodConfig.RetryPolicy; @@ -60,12 +59,12 @@ public static String getLibName(GapicContext context) { // discrepancies // eg. for vision proto: "com.google.cloud.vision.v1" // https://github.com/googleapis/java-vision/blob/main/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto#L36 - List pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context)); - return pakkagePhrases.get(pakkagePhrases.size() - 2); + // List pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context)); + // return pakkagePhrases.get(pakkagePhrases.size() - 2); - // Option 3: Parse ApiShortName from service proto's default host (e.g. vision.googleapis.com) - // TODO: Replace implementation above to reuse parsing logic from SampleGen: - // https://github.com/googleapis/gapic-generator-java/pull/1040 + // Option 3: Use parsed apiShortName from service proto's default host + // (e.g. vision.googleapis.com => vision) + return context.services().get(0).apiShortName(); } public static String getPackageName(GapicContext context) { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden index d7ed65e461..d88f6b6892 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden @@ -1,4 +1,4 @@ -/** Spring Boot auto-configurations for showcase. */ +/** Spring Boot auto-configurations for localhost:7469. */ @Generated("by gapic-generator-java") package com.google.showcase.v1beta1.spring; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden index 4be7458a76..a73703ef49 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden @@ -14,7 +14,7 @@ * limitations under the License. */ -/** Spring Boot auto-configurations for showcase. */ +/** Spring Boot auto-configurations for localhost:7469. */ @Generated("by gapic-generator-java") package com.google.showcase.v1beta1.spring; diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden index 5da3bd87f0..16963f0b1c 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden @@ -3,7 +3,7 @@ { "name": "com.google.showcase.v1beta1.spring.auto.echo.enabled", "type": "java.lang.Boolean", - "description": "Auto-configure Google Cloud showcase/Echo components.", + "description": "Auto-configure Google Cloud localhost:7469/Echo components.", "defaultValue": true } ] diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden index 4c6080fe0d..e772bef703 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -6,8 +6,8 @@ com.google.cloud com-google-showcase-v1beta1-spring-starter {{starter-version}} - Spring Boot Starter - showcase - Spring Boot Starter with AutoConfiguration for showcase + Spring Boot Starter - localhost:7469 + Spring Boot Starter with AutoConfiguration for localhost:7469 From 86fd9ddfa84b1f3f673811cf909c6cfa540271b4 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 10 Nov 2022 18:47:14 -0500 Subject: [PATCH 072/103] fix(Spring CodeGen): Add user-agent header to generated client for metrics (#1064) Adding user-agent header to generated client for metrics. Will mark this ready when header is setup and tested. Also included some cleanups on un-used code in class (second committish - 04814ef). --- .../SpringAutoConfigClassComposer.java | 186 +++++++++++------- .../EchoSpringAutoConfigurationFull.golden | 10 +- .../EchoSpringAutoConfigurationGrpc.golden | 10 +- ...EchoSpringAutoConfigurationGrpcRest.golden | 10 +- 4 files changed, 138 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 5af37202d9..1a97af96c7 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -17,6 +17,7 @@ import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.ArithmeticOperationExpr; @@ -27,6 +28,7 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.IfStatement; +import com.google.api.generator.engine.ast.LambdaExpr; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; @@ -54,27 +56,21 @@ import com.google.api.generator.spring.utils.Utils; import com.google.common.base.CaseFormat; import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; public class SpringAutoConfigClassComposer implements ClassComposer { private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; - private static final String OPERATIONS_STUB_MEMBER_NAME = "operationsStub"; - private static final String BACKGROUND_RESOURCES_MEMBER_NAME = "backgroundResources"; - private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS"; private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); private static final Map STATIC_TYPES = createStaticTypes(); - private static final VariableExpr NESTED_RETRY_PARAM_DEFINITIONS_VAR_EXPR = - createNestedRetryParamDefinitionsVarExpr(); - private SpringAutoConfigClassComposer() {} public static SpringAutoConfigClassComposer instance() { @@ -87,6 +83,7 @@ public GapicClass generate(GapicContext context, Service service) { Map types = createDynamicTypes(service, packageName); String serviceName = service.name(); String serviceNameLowerCamel = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); + String serviceNameLowerHyphen = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); String className = getThisClassName(serviceName); String credentialsProviderName = serviceNameLowerCamel + "Credentials"; String transportChannelProviderName = "default" + serviceName + "TransportChannelProvider"; @@ -97,6 +94,7 @@ public GapicClass generate(GapicContext context, Service service) { types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider")); + Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); Transport transport = context.transport(); boolean hasRestOption = transport.equals(Transport.GRPC_REST); @@ -111,11 +109,10 @@ public GapicClass generate(GapicContext context, Service service) { .setAnnotations(createClassAnnotations(service, types)) .setMethods( Arrays.asList( - createConstructor(service.name(), className, types), + createConstructor(service.name(), className, types, thisExpr), createCredentialsProviderBeanMethod( - service, className, credentialsProviderName, types), - createTransportChannelProviderBeanMethod( - service, transportChannelProviderName, types), + service, className, credentialsProviderName, types, thisExpr), + createTransportChannelProviderBeanMethod(transportChannelProviderName, types), createClientBeanMethod( service, className, @@ -124,27 +121,15 @@ public GapicClass generate(GapicContext context, Service service) { clientName, types, gapicServiceConfig, - hasRestOption))) + thisExpr, + hasRestOption), + createUserAgentHeaderProviderMethod( + serviceNameLowerHyphen, className, types, thisExpr))) .build(); return GapicClass.create(kind, classDef); } - private static VariableExpr createNestedRetryParamDefinitionsVarExpr() { - TypeNode varType = - TypeNode.withReference( - ConcreteReference.builder() - .setClazz(ImmutableMap.class) - .setGenerics( - Arrays.asList(TypeNode.STRING, STATIC_TYPES.get("RetrySettings")).stream() - .map(t -> t.reference()) - .collect(Collectors.toList())) - .build()); - - return VariableExpr.withVariable( - Variable.builder().setType(varType).setName(RETRY_PARAM_DEFINITIONS_VAR_NAME).build()); - } - private static List createMemberVariables( Service service, String packageName, @@ -174,41 +159,19 @@ private static List createMemberVariables( } private static MethodDefinition createConstructor( - String serviceName, String className, Map types) { - /// constructor - // VariableExpr credentialsProviderBuilderVarExpr = - // VariableExpr.withVariable( - // Variable.builder() - // .setName("coreCredentialsProvider") - // .setType(types.get("CredentialsProvider")) - // .build()); - // - // VariableExpr coreProjectIdProviderVarExpr = - // VariableExpr.withVariable( - // Variable.builder() - // .setName("coreProjectIdProvider") - // .setType(types.get("GcpProjectIdProvider")) - // .build()); - + String serviceName, String className, Map types, Expr thisExpr) { VariableExpr propertiesVarExpr = VariableExpr.withVariable( Variable.builder() .setName("clientProperties") .setType(types.get(serviceName + "Properties")) .build()); - // Variable projectIdProviderVar = - // Variable.builder() - // .setName("projectIdProvider") - // .setType(types.get("GcpProjectIdProvider")) - // .build(); Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") .setType(types.get(serviceName + "Properties")) .build(); - Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); - // this.clientProperties = clientProperties; AssignmentExpr thisPropertiesAssignmentExpr = AssignmentExpr.builder() @@ -275,19 +238,6 @@ private static List createClassAnnotations( .setStaticReferenceType(types.get("ServiceClient")) .build()) .build(); - - AssignmentExpr proxyBeanMethodsAssignmentExpr = - AssignmentExpr.builder() - .setVariableExpr( - VariableExpr.withVariable( - Variable.builder() - .setName("proxyBeanMethods") - .setType(TypeNode.BOOLEAN) - .build())) - .setValueExpr( - ValueExpr.withValue( - PrimitiveValue.builder().setValue("false").setType(TypeNode.BOOLEAN).build())) - .build(); AnnotationNode configurationNode = AnnotationNode.builder().setType(types.get("AutoConfiguration")).build(); AnnotationNode enableConfigurationPropertiesNode = @@ -309,7 +259,11 @@ private static List createClassAnnotations( } private static MethodDefinition createCredentialsProviderBeanMethod( - Service service, String className, String methodName, Map types) { + Service service, + String className, + String methodName, + Map types, + Expr thisExpr) { // @Bean // @ConditionalOnMissingBean // public CredentialsProvider languageServiceCredentials() throws IOException { @@ -322,7 +276,6 @@ private static MethodDefinition createCredentialsProviderBeanMethod( .setType(types.get(service.name() + "Properties")) .build(); - Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); VariableExpr thisClientProperties = VariableExpr.withVariable(clientPropertiesVar) .toBuilder() @@ -354,7 +307,7 @@ private static MethodDefinition createCredentialsProviderBeanMethod( } private static MethodDefinition createTransportChannelProviderBeanMethod( - Service service, String methodName, Map types) { + String methodName, Map types) { // @Bean // @ConditionalOnMissingBean @@ -472,6 +425,7 @@ private static MethodDefinition createClientBeanMethod( String clientName, Map types, GapicServiceConfig gapicServiceConfig, + Expr thisExpr, boolean hasRestOption) { // argument variables: VariableExpr credentialsProviderVariableExpr = @@ -520,15 +474,18 @@ private static MethodDefinition createClientBeanMethod( .setMethodName("setTransportChannelProvider") .setArguments(transportChannelProviderVariableExpr) .build(); - - // .setHeaderProvider( - // new UserAgentHeaderProvider(this.getClass())); + // .setHeaderProvider(this.serAgentHeaderProvider()); + MethodInvocationExpr userAgentHeaderProviderInvocation = + MethodInvocationExpr.builder() + .setExprReferenceExpr(thisExpr) + .setMethodName("userAgentHeaderProvider") + .setReturnType(STATIC_TYPES.get("HeaderProvider")) + .build(); settingsBuilderExpr = MethodInvocationExpr.builder() .setExprReferenceExpr(settingsBuilderExpr) .setMethodName("setHeaderProvider") - // .setArguments() //TODO add augument here to create new obj. Caveat: decide where to - // UserAgentHeaderProvider class first. + .setArguments(userAgentHeaderProviderInvocation) .setReturnType(settingBuilderVariable.type()) .build(); AssignmentExpr settingCreateExpr = @@ -544,7 +501,6 @@ private static MethodDefinition createClientBeanMethod( // LOGGER.info("Quota project id set to: " + clientProperties.getQuotaProjectId() // + ", this overrides project id from credentials."); // } - Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className))); Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") @@ -840,6 +796,85 @@ private static MethodDefinition createClientBeanMethod( .build(); } + private static MethodDefinition createUserAgentHeaderProviderMethod( + String serviceName, String className, Map types, Expr thisExpr) { + // private HeaderProvider userAgentHeaderProvider() { + // String springLibrary = "spring-autogen-language"; + // String version = this.getClass().getPackage().getImplementationVersion(); + // return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + // } + List bodyStatements = new ArrayList<>(); + + VariableExpr springLibStringVariableExpr = + VariableExpr.builder() + .setVariable( + Variable.builder().setName("springLibrary").setType(TypeNode.STRING).build()) + .setIsDecl(true) + .build(); + Expr springLibStringValueExpr = + ValueExpr.withValue(StringObjectValue.withValue("spring-autogen-" + serviceName)); + + AssignmentExpr springLibStringAssignExpr = + AssignmentExpr.builder() + .setVariableExpr(springLibStringVariableExpr) + .setValueExpr(springLibStringValueExpr) + .build(); + bodyStatements.add(ExprStatement.withExpr(springLibStringAssignExpr)); + + VariableExpr versionStringVariableExpr = + VariableExpr.builder() + .setVariable(Variable.builder().setName("version").setType(TypeNode.STRING).build()) + .setIsDecl(true) + .build(); + Expr thisVersionExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(thisExpr) + .setMethodName("getClass") + .build(); + thisVersionExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(thisVersionExpr) + .setMethodName("getPackage") + .build(); + thisVersionExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(thisVersionExpr) + .setMethodName("getImplementationVersion") + .setReturnType(TypeNode.STRING) + .build(); + AssignmentExpr versionStringAssignExpr = + AssignmentExpr.builder() + .setVariableExpr(versionStringVariableExpr) + .setValueExpr(thisVersionExpr) + .build(); + bodyStatements.add(ExprStatement.withExpr(versionStringAssignExpr)); + + ValueExpr slash = ValueExpr.withValue(StringObjectValue.withValue("/")); + ArithmeticOperationExpr userAgentStringConcat = + ArithmeticOperationExpr.concatWithExprs( + springLibStringVariableExpr.toBuilder().setIsDecl(false).build(), slash); + userAgentStringConcat = + ArithmeticOperationExpr.concatWithExprs( + userAgentStringConcat, versionStringVariableExpr.toBuilder().setIsDecl(false).build()); + Expr collectionsExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(STATIC_TYPES.get("Collections")) + .setMethodName("singletonMap") + .setArguments( + ValueExpr.withValue(StringObjectValue.withValue("user-agent")), + userAgentStringConcat) + .setReturnType(STATIC_TYPES.get("HeaderProvider")) + .build(); + LambdaExpr returnExpr = LambdaExpr.builder().setReturnExpr(collectionsExpr).build(); + return MethodDefinition.builder() + .setName("userAgentHeaderProvider") + .setScope(ScopeNode.PRIVATE) + .setReturnType(STATIC_TYPES.get("HeaderProvider")) + .setReturnExpr(returnExpr) + .setBody(bodyStatements) + .build(); + } + private static Map createStaticTypes() { List concreteClazzes = Arrays.asList( @@ -849,12 +884,13 @@ private static Map createStaticTypes() { TransportChannelProvider.class, // import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; InstantiatingHttpJsonChannelProvider.class, - ExecutorProvider.class); + ExecutorProvider.class, + HeaderProvider.class, + Collections.class); return concreteClazzes.stream() .collect( Collectors.toMap( - c -> c.getSimpleName(), - c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); + Class::getSimpleName, c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); } private static Map createDynamicTypes(Service service, String packageName) { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 15c1d4c6f9..f26048224e 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -20,11 +20,13 @@ import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.spring.core.DefaultCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; +import java.util.Collections; import javax.annotation.Generated; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -108,7 +110,7 @@ public class EchoSpringAutoConfiguration { EchoSettings.newBuilder() .setCredentialsProvider(credentialsProvider) .setTransportChannelProvider(defaultTransportChannelProvider) - .setHeaderProvider(); + .setHeaderProvider(this.userAgentHeaderProvider()); if (this.clientProperties.getQuotaProjectId() != null) { clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); LOGGER.info( @@ -447,4 +449,10 @@ public class EchoSpringAutoConfiguration { .setRetrySettings(collideNameRetrySettingBuilder.build()); return EchoClient.create(clientSettingsBuilder.build()); } + + private HeaderProvider userAgentHeaderProvider() { + String springLibrary = "spring-autogen-echo"; + String version = this.getClass().getPackage().getImplementationVersion(); + return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden index cad5a2bc75..ce5f3e5509 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -3,11 +3,13 @@ package com.google.showcase.v1beta1.spring; import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.spring.core.DefaultCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; +import java.util.Collections; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -88,7 +90,7 @@ public class EchoSpringAutoConfiguration { EchoSettings.newBuilder() .setCredentialsProvider(credentialsProvider) .setTransportChannelProvider(defaultTransportChannelProvider) - .setHeaderProvider(); + .setHeaderProvider(this.userAgentHeaderProvider()); if (this.clientProperties.getQuotaProjectId() != null) { clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); LOGGER.info( @@ -427,4 +429,10 @@ public class EchoSpringAutoConfiguration { .setRetrySettings(collideNameRetrySettingBuilder.build()); return EchoClient.create(clientSettingsBuilder.build()); } + + private HeaderProvider userAgentHeaderProvider() { + String springLibrary = "spring-autogen-echo"; + String version = this.getClass().getPackage().getImplementationVersion(); + return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden index e25e7ec599..a8c3faa1a5 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden @@ -4,11 +4,13 @@ import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.spring.core.DefaultCredentialsProvider; import com.google.showcase.v1beta1.EchoClient; import com.google.showcase.v1beta1.EchoSettings; import java.io.IOException; +import java.util.Collections; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -89,7 +91,7 @@ public class EchoSpringAutoConfiguration { EchoSettings.newBuilder() .setCredentialsProvider(credentialsProvider) .setTransportChannelProvider(defaultTransportChannelProvider) - .setHeaderProvider(); + .setHeaderProvider(this.userAgentHeaderProvider()); if (this.clientProperties.getQuotaProjectId() != null) { clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); LOGGER.info( @@ -433,4 +435,10 @@ public class EchoSpringAutoConfiguration { .setRetrySettings(collideNameRetrySettingBuilder.build()); return EchoClient.create(clientSettingsBuilder.build()); } + + private HeaderProvider userAgentHeaderProvider() { + String springLibrary = "spring-autogen-echo"; + String version = this.getClass().getPackage().getImplementationVersion(); + return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + } } From c79dab2e63c83a5a97d266dfabab715facf73854 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 14 Nov 2022 10:15:19 -0500 Subject: [PATCH 073/103] fix(spring codegen): use client-library-artifact-id as pom artifactId prefix. (#1092) --- .../java/com/google/api/generator/spring/SpringWriter.java | 4 +--- .../api/generator/spring/goldens/SpringPackagePom.golden | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 6b1280d3dc..77dc05989d 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -204,14 +204,12 @@ private static void writeSpringAdditionalMetadataJson(GapicContext context, JarO @VisibleForTesting static String buildPomString(GapicContext context) { - String pakkageName = Utils.getPackageName(context); - pakkageName = pakkageName.replace('.', '-'); String clientLibraryShortName = Utils.getLibName(context); String clientLibraryGroupId = "{{client-library-group-id}}"; String clientLibraryName = "{{client-library-artifact-id}}"; String clientLibraryVersion = "{{client-library-version}}"; - String springStarterArtifactId = pakkageName + "-spring-starter"; + String springStarterArtifactId = clientLibraryName + "-spring-starter"; String springStarterVersion = "{{starter-version}}"; String springStarterName = "Spring Boot Starter - " + clientLibraryShortName; diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden index e772bef703..b6b2632c24 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -4,7 +4,7 @@ 4.0.0 com.google.cloud - com-google-showcase-v1beta1-spring-starter + {{client-library-artifact-id}}-spring-starter {{starter-version}} Spring Boot Starter - localhost:7469 Spring Boot Starter with AutoConfiguration for localhost:7469 From b873b60209b1cfebf74f32891acb5f7941321157 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Wed, 16 Nov 2022 09:51:36 -0500 Subject: [PATCH 074/103] fix(spring): update setters for properties of type Duration (#1093) * Updates setters for Spring properties of type org.threeten.bp.Duration to accept argument of type java.time.Duration instead, and parse to org.threeten.bp.Duration in the setter body. * Converting between the two types: parse() and toString() methods for both will accept or return ISO-8601 seconds based representation, such as PT8H6M12.345S. * This addresses the issue that properties of type org.threeten.bp.Duration cannot be set from strings (e.g. specified in Spring property files) because the implicit conversion is unsupported. Spring boot has dedicated support for properties of type java.time.Duration. --- .../SpringPropertiesClassComposer.java | 45 ++++-- .../goldens/EchoSpringPropertiesFull.golden | 146 +++++++++--------- .../goldens/EchoSpringPropertiesGrpc.golden | 146 +++++++++--------- .../EchoSpringPropertiesGrpcRest.golden | 146 +++++++++--------- 4 files changed, 256 insertions(+), 227 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 685830d7f8..b3df0469d1 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -25,6 +25,7 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.MethodDefinition; +import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.ScopeNode; @@ -291,8 +292,36 @@ private static MethodDefinition createGetterMethod( private static MethodDefinition createSetterMethod( TypeNode thisClassType, String propertyName, TypeNode returnType) { + + // Common building blocks Variable propertyVar = Variable.builder().setName(propertyName).setType(returnType).build(); Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType)); + TypeNode threetenBpDurationType = staticTypes.get("org.threeten.bp.Duration"); + TypeNode javaTimeDurationType = staticTypes.get("java.time.Duration"); + + // Default building blocks - may be updated in Duration condition below + Variable argumentVar = propertyVar; + Expr propertyValueExpr = VariableExpr.withVariable(argumentVar); + + // Setter logic for Duration accepts different type and handles conversion + if (returnType.equals(threetenBpDurationType)) { + argumentVar = Variable.builder().setName(propertyName).setType(javaTimeDurationType).build(); + + MethodInvocationExpr durationToStringExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(VariableExpr.withVariable(argumentVar)) + .setMethodName("toString") + .setReturnType(TypeNode.STRING) + .build(); + + propertyValueExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(threetenBpDurationType) + .setMethodName("parse") + .setArguments(durationToStringExpr) + .setReturnType(threetenBpDurationType) + .build(); + } AssignmentExpr propertyVarExpr = AssignmentExpr.builder() @@ -301,7 +330,7 @@ private static MethodDefinition createSetterMethod( .toBuilder() .setExprReferenceExpr(thisExpr) .build()) - .setValueExpr(VariableExpr.withVariable(propertyVar)) + .setValueExpr(propertyValueExpr) .build(); String methodName = "set" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, propertyName); @@ -310,7 +339,7 @@ private static MethodDefinition createSetterMethod( .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(TypeNode.VOID) - .setArguments(VariableExpr.builder().setVariable(propertyVar).setIsDecl(true).build()) + .setArguments(VariableExpr.builder().setVariable(argumentVar).setIsDecl(true).build()) .setBody(Arrays.asList(ExprStatement.withExpr(propertyVarExpr))) .build(); } @@ -365,14 +394,8 @@ private static Map createDynamicTypes(Service service, String .setPakkage("org.springframework.boot.context.properties") .build()); - // import org.threeten.bp.Duration; - TypeNode duration = - TypeNode.withReference( - VaporReference.builder().setName("Duration").setPakkage("org.threeten.bp").build()); - typeMap.put(service.name() + "Properties", clientProperties); typeMap.put("Credentials", credentials); - typeMap.put("Duration", duration); typeMap.put("CredentialsSupplier", credentialsSupplier); typeMap.put("ConfigurationProperties", configurationProperties); typeMap.put("NestedConfigurationProperty", nestedConfigurationProperty); @@ -382,11 +405,11 @@ private static Map createDynamicTypes(Service service, String private static Map createStaticTypes() { List concreteClazzes = - Arrays.asList(RetrySettings.class, org.threeten.bp.Duration.class); + Arrays.asList( + RetrySettings.class, org.threeten.bp.Duration.class, java.time.Duration.class); return concreteClazzes.stream() .collect( Collectors.toMap( - c -> c.getSimpleName(), - c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); + Class::getName, c -> TypeNode.withReference(ConcreteReference.withClazz(c)))); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden index f568eef8db..1a999d318d 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesFull.golden @@ -111,8 +111,8 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoInitialRetryDelay; } - public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { - this.echoInitialRetryDelay = echoInitialRetryDelay; + public void setEchoInitialRetryDelay(java.time.Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = Duration.parse(echoInitialRetryDelay.toString()); } public Double getEchoRetryDelayMultiplier() { @@ -127,16 +127,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRetryDelay; } - public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { - this.echoMaxRetryDelay = echoMaxRetryDelay; + public void setEchoMaxRetryDelay(java.time.Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = Duration.parse(echoMaxRetryDelay.toString()); } public Duration getEchoInitialRpcTimeout() { return this.echoInitialRpcTimeout; } - public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { - this.echoInitialRpcTimeout = echoInitialRpcTimeout; + public void setEchoInitialRpcTimeout(java.time.Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = Duration.parse(echoInitialRpcTimeout.toString()); } public Double getEchoRpcTimeoutMultiplier() { @@ -151,24 +151,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRpcTimeout; } - public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { - this.echoMaxRpcTimeout = echoMaxRpcTimeout; + public void setEchoMaxRpcTimeout(java.time.Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = Duration.parse(echoMaxRpcTimeout.toString()); } public Duration getEchoTotalTimeout() { return this.echoTotalTimeout; } - public void setEchoTotalTimeout(Duration echoTotalTimeout) { - this.echoTotalTimeout = echoTotalTimeout; + public void setEchoTotalTimeout(java.time.Duration echoTotalTimeout) { + this.echoTotalTimeout = Duration.parse(echoTotalTimeout.toString()); } public Duration getExpandInitialRetryDelay() { return this.expandInitialRetryDelay; } - public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { - this.expandInitialRetryDelay = expandInitialRetryDelay; + public void setExpandInitialRetryDelay(java.time.Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = Duration.parse(expandInitialRetryDelay.toString()); } public Double getExpandRetryDelayMultiplier() { @@ -183,16 +183,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRetryDelay; } - public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { - this.expandMaxRetryDelay = expandMaxRetryDelay; + public void setExpandMaxRetryDelay(java.time.Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = Duration.parse(expandMaxRetryDelay.toString()); } public Duration getExpandInitialRpcTimeout() { return this.expandInitialRpcTimeout; } - public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { - this.expandInitialRpcTimeout = expandInitialRpcTimeout; + public void setExpandInitialRpcTimeout(java.time.Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = Duration.parse(expandInitialRpcTimeout.toString()); } public Double getExpandRpcTimeoutMultiplier() { @@ -207,24 +207,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRpcTimeout; } - public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { - this.expandMaxRpcTimeout = expandMaxRpcTimeout; + public void setExpandMaxRpcTimeout(java.time.Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = Duration.parse(expandMaxRpcTimeout.toString()); } public Duration getExpandTotalTimeout() { return this.expandTotalTimeout; } - public void setExpandTotalTimeout(Duration expandTotalTimeout) { - this.expandTotalTimeout = expandTotalTimeout; + public void setExpandTotalTimeout(java.time.Duration expandTotalTimeout) { + this.expandTotalTimeout = Duration.parse(expandTotalTimeout.toString()); } public Duration getCollectInitialRpcTimeout() { return this.collectInitialRpcTimeout; } - public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { - this.collectInitialRpcTimeout = collectInitialRpcTimeout; + public void setCollectInitialRpcTimeout(java.time.Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = Duration.parse(collectInitialRpcTimeout.toString()); } public Double getCollectRpcTimeoutMultiplier() { @@ -239,24 +239,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collectMaxRpcTimeout; } - public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { - this.collectMaxRpcTimeout = collectMaxRpcTimeout; + public void setCollectMaxRpcTimeout(java.time.Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = Duration.parse(collectMaxRpcTimeout.toString()); } public Duration getCollectTotalTimeout() { return this.collectTotalTimeout; } - public void setCollectTotalTimeout(Duration collectTotalTimeout) { - this.collectTotalTimeout = collectTotalTimeout; + public void setCollectTotalTimeout(java.time.Duration collectTotalTimeout) { + this.collectTotalTimeout = Duration.parse(collectTotalTimeout.toString()); } public Duration getChatInitialRpcTimeout() { return this.chatInitialRpcTimeout; } - public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { - this.chatInitialRpcTimeout = chatInitialRpcTimeout; + public void setChatInitialRpcTimeout(java.time.Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = Duration.parse(chatInitialRpcTimeout.toString()); } public Double getChatRpcTimeoutMultiplier() { @@ -271,24 +271,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatMaxRpcTimeout; } - public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { - this.chatMaxRpcTimeout = chatMaxRpcTimeout; + public void setChatMaxRpcTimeout(java.time.Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = Duration.parse(chatMaxRpcTimeout.toString()); } public Duration getChatTotalTimeout() { return this.chatTotalTimeout; } - public void setChatTotalTimeout(Duration chatTotalTimeout) { - this.chatTotalTimeout = chatTotalTimeout; + public void setChatTotalTimeout(java.time.Duration chatTotalTimeout) { + this.chatTotalTimeout = Duration.parse(chatTotalTimeout.toString()); } public Duration getChatAgainInitialRpcTimeout() { return this.chatAgainInitialRpcTimeout; } - public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { - this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + public void setChatAgainInitialRpcTimeout(java.time.Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = Duration.parse(chatAgainInitialRpcTimeout.toString()); } public Double getChatAgainRpcTimeoutMultiplier() { @@ -303,24 +303,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatAgainMaxRpcTimeout; } - public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { - this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + public void setChatAgainMaxRpcTimeout(java.time.Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = Duration.parse(chatAgainMaxRpcTimeout.toString()); } public Duration getChatAgainTotalTimeout() { return this.chatAgainTotalTimeout; } - public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { - this.chatAgainTotalTimeout = chatAgainTotalTimeout; + public void setChatAgainTotalTimeout(java.time.Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = Duration.parse(chatAgainTotalTimeout.toString()); } public Duration getPagedExpandInitialRetryDelay() { return this.pagedExpandInitialRetryDelay; } - public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { - this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + public void setPagedExpandInitialRetryDelay(java.time.Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = Duration.parse(pagedExpandInitialRetryDelay.toString()); } public Double getPagedExpandRetryDelayMultiplier() { @@ -335,16 +335,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRetryDelay; } - public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { - this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + public void setPagedExpandMaxRetryDelay(java.time.Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = Duration.parse(pagedExpandMaxRetryDelay.toString()); } public Duration getPagedExpandInitialRpcTimeout() { return this.pagedExpandInitialRpcTimeout; } - public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { - this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + public void setPagedExpandInitialRpcTimeout(java.time.Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = Duration.parse(pagedExpandInitialRpcTimeout.toString()); } public Double getPagedExpandRpcTimeoutMultiplier() { @@ -359,24 +359,26 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRpcTimeout; } - public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { - this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + public void setPagedExpandMaxRpcTimeout(java.time.Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = Duration.parse(pagedExpandMaxRpcTimeout.toString()); } public Duration getPagedExpandTotalTimeout() { return this.pagedExpandTotalTimeout; } - public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { - this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + public void setPagedExpandTotalTimeout(java.time.Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = Duration.parse(pagedExpandTotalTimeout.toString()); } public Duration getSimplePagedExpandInitialRpcTimeout() { return this.simplePagedExpandInitialRpcTimeout; } - public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { - this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + public void setSimplePagedExpandInitialRpcTimeout( + java.time.Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = + Duration.parse(simplePagedExpandInitialRpcTimeout.toString()); } public Double getSimplePagedExpandRpcTimeoutMultiplier() { @@ -392,24 +394,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.simplePagedExpandMaxRpcTimeout; } - public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { - this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + public void setSimplePagedExpandMaxRpcTimeout(java.time.Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = Duration.parse(simplePagedExpandMaxRpcTimeout.toString()); } public Duration getSimplePagedExpandTotalTimeout() { return this.simplePagedExpandTotalTimeout; } - public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { - this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + public void setSimplePagedExpandTotalTimeout(java.time.Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = Duration.parse(simplePagedExpandTotalTimeout.toString()); } public Duration getWaitInitialRpcTimeout() { return this.waitInitialRpcTimeout; } - public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { - this.waitInitialRpcTimeout = waitInitialRpcTimeout; + public void setWaitInitialRpcTimeout(java.time.Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = Duration.parse(waitInitialRpcTimeout.toString()); } public Double getWaitRpcTimeoutMultiplier() { @@ -424,24 +426,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.waitMaxRpcTimeout; } - public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { - this.waitMaxRpcTimeout = waitMaxRpcTimeout; + public void setWaitMaxRpcTimeout(java.time.Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = Duration.parse(waitMaxRpcTimeout.toString()); } public Duration getWaitTotalTimeout() { return this.waitTotalTimeout; } - public void setWaitTotalTimeout(Duration waitTotalTimeout) { - this.waitTotalTimeout = waitTotalTimeout; + public void setWaitTotalTimeout(java.time.Duration waitTotalTimeout) { + this.waitTotalTimeout = Duration.parse(waitTotalTimeout.toString()); } public Duration getBlockInitialRpcTimeout() { return this.blockInitialRpcTimeout; } - public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { - this.blockInitialRpcTimeout = blockInitialRpcTimeout; + public void setBlockInitialRpcTimeout(java.time.Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = Duration.parse(blockInitialRpcTimeout.toString()); } public Double getBlockRpcTimeoutMultiplier() { @@ -456,24 +458,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.blockMaxRpcTimeout; } - public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { - this.blockMaxRpcTimeout = blockMaxRpcTimeout; + public void setBlockMaxRpcTimeout(java.time.Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = Duration.parse(blockMaxRpcTimeout.toString()); } public Duration getBlockTotalTimeout() { return this.blockTotalTimeout; } - public void setBlockTotalTimeout(Duration blockTotalTimeout) { - this.blockTotalTimeout = blockTotalTimeout; + public void setBlockTotalTimeout(java.time.Duration blockTotalTimeout) { + this.blockTotalTimeout = Duration.parse(blockTotalTimeout.toString()); } public Duration getCollideNameInitialRpcTimeout() { return this.collideNameInitialRpcTimeout; } - public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { - this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + public void setCollideNameInitialRpcTimeout(java.time.Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = Duration.parse(collideNameInitialRpcTimeout.toString()); } public Double getCollideNameRpcTimeoutMultiplier() { @@ -488,15 +490,15 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collideNameMaxRpcTimeout; } - public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { - this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + public void setCollideNameMaxRpcTimeout(java.time.Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = Duration.parse(collideNameMaxRpcTimeout.toString()); } public Duration getCollideNameTotalTimeout() { return this.collideNameTotalTimeout; } - public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { - this.collideNameTotalTimeout = collideNameTotalTimeout; + public void setCollideNameTotalTimeout(java.time.Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = Duration.parse(collideNameTotalTimeout.toString()); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden index 3767554993..84798083a6 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpc.golden @@ -91,8 +91,8 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoInitialRetryDelay; } - public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { - this.echoInitialRetryDelay = echoInitialRetryDelay; + public void setEchoInitialRetryDelay(java.time.Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = Duration.parse(echoInitialRetryDelay.toString()); } public Double getEchoRetryDelayMultiplier() { @@ -107,16 +107,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRetryDelay; } - public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { - this.echoMaxRetryDelay = echoMaxRetryDelay; + public void setEchoMaxRetryDelay(java.time.Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = Duration.parse(echoMaxRetryDelay.toString()); } public Duration getEchoInitialRpcTimeout() { return this.echoInitialRpcTimeout; } - public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { - this.echoInitialRpcTimeout = echoInitialRpcTimeout; + public void setEchoInitialRpcTimeout(java.time.Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = Duration.parse(echoInitialRpcTimeout.toString()); } public Double getEchoRpcTimeoutMultiplier() { @@ -131,24 +131,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRpcTimeout; } - public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { - this.echoMaxRpcTimeout = echoMaxRpcTimeout; + public void setEchoMaxRpcTimeout(java.time.Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = Duration.parse(echoMaxRpcTimeout.toString()); } public Duration getEchoTotalTimeout() { return this.echoTotalTimeout; } - public void setEchoTotalTimeout(Duration echoTotalTimeout) { - this.echoTotalTimeout = echoTotalTimeout; + public void setEchoTotalTimeout(java.time.Duration echoTotalTimeout) { + this.echoTotalTimeout = Duration.parse(echoTotalTimeout.toString()); } public Duration getExpandInitialRetryDelay() { return this.expandInitialRetryDelay; } - public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { - this.expandInitialRetryDelay = expandInitialRetryDelay; + public void setExpandInitialRetryDelay(java.time.Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = Duration.parse(expandInitialRetryDelay.toString()); } public Double getExpandRetryDelayMultiplier() { @@ -163,16 +163,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRetryDelay; } - public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { - this.expandMaxRetryDelay = expandMaxRetryDelay; + public void setExpandMaxRetryDelay(java.time.Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = Duration.parse(expandMaxRetryDelay.toString()); } public Duration getExpandInitialRpcTimeout() { return this.expandInitialRpcTimeout; } - public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { - this.expandInitialRpcTimeout = expandInitialRpcTimeout; + public void setExpandInitialRpcTimeout(java.time.Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = Duration.parse(expandInitialRpcTimeout.toString()); } public Double getExpandRpcTimeoutMultiplier() { @@ -187,24 +187,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRpcTimeout; } - public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { - this.expandMaxRpcTimeout = expandMaxRpcTimeout; + public void setExpandMaxRpcTimeout(java.time.Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = Duration.parse(expandMaxRpcTimeout.toString()); } public Duration getExpandTotalTimeout() { return this.expandTotalTimeout; } - public void setExpandTotalTimeout(Duration expandTotalTimeout) { - this.expandTotalTimeout = expandTotalTimeout; + public void setExpandTotalTimeout(java.time.Duration expandTotalTimeout) { + this.expandTotalTimeout = Duration.parse(expandTotalTimeout.toString()); } public Duration getCollectInitialRpcTimeout() { return this.collectInitialRpcTimeout; } - public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { - this.collectInitialRpcTimeout = collectInitialRpcTimeout; + public void setCollectInitialRpcTimeout(java.time.Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = Duration.parse(collectInitialRpcTimeout.toString()); } public Double getCollectRpcTimeoutMultiplier() { @@ -219,24 +219,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collectMaxRpcTimeout; } - public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { - this.collectMaxRpcTimeout = collectMaxRpcTimeout; + public void setCollectMaxRpcTimeout(java.time.Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = Duration.parse(collectMaxRpcTimeout.toString()); } public Duration getCollectTotalTimeout() { return this.collectTotalTimeout; } - public void setCollectTotalTimeout(Duration collectTotalTimeout) { - this.collectTotalTimeout = collectTotalTimeout; + public void setCollectTotalTimeout(java.time.Duration collectTotalTimeout) { + this.collectTotalTimeout = Duration.parse(collectTotalTimeout.toString()); } public Duration getChatInitialRpcTimeout() { return this.chatInitialRpcTimeout; } - public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { - this.chatInitialRpcTimeout = chatInitialRpcTimeout; + public void setChatInitialRpcTimeout(java.time.Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = Duration.parse(chatInitialRpcTimeout.toString()); } public Double getChatRpcTimeoutMultiplier() { @@ -251,24 +251,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatMaxRpcTimeout; } - public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { - this.chatMaxRpcTimeout = chatMaxRpcTimeout; + public void setChatMaxRpcTimeout(java.time.Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = Duration.parse(chatMaxRpcTimeout.toString()); } public Duration getChatTotalTimeout() { return this.chatTotalTimeout; } - public void setChatTotalTimeout(Duration chatTotalTimeout) { - this.chatTotalTimeout = chatTotalTimeout; + public void setChatTotalTimeout(java.time.Duration chatTotalTimeout) { + this.chatTotalTimeout = Duration.parse(chatTotalTimeout.toString()); } public Duration getChatAgainInitialRpcTimeout() { return this.chatAgainInitialRpcTimeout; } - public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { - this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + public void setChatAgainInitialRpcTimeout(java.time.Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = Duration.parse(chatAgainInitialRpcTimeout.toString()); } public Double getChatAgainRpcTimeoutMultiplier() { @@ -283,24 +283,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatAgainMaxRpcTimeout; } - public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { - this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + public void setChatAgainMaxRpcTimeout(java.time.Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = Duration.parse(chatAgainMaxRpcTimeout.toString()); } public Duration getChatAgainTotalTimeout() { return this.chatAgainTotalTimeout; } - public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { - this.chatAgainTotalTimeout = chatAgainTotalTimeout; + public void setChatAgainTotalTimeout(java.time.Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = Duration.parse(chatAgainTotalTimeout.toString()); } public Duration getPagedExpandInitialRetryDelay() { return this.pagedExpandInitialRetryDelay; } - public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { - this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + public void setPagedExpandInitialRetryDelay(java.time.Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = Duration.parse(pagedExpandInitialRetryDelay.toString()); } public Double getPagedExpandRetryDelayMultiplier() { @@ -315,16 +315,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRetryDelay; } - public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { - this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + public void setPagedExpandMaxRetryDelay(java.time.Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = Duration.parse(pagedExpandMaxRetryDelay.toString()); } public Duration getPagedExpandInitialRpcTimeout() { return this.pagedExpandInitialRpcTimeout; } - public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { - this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + public void setPagedExpandInitialRpcTimeout(java.time.Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = Duration.parse(pagedExpandInitialRpcTimeout.toString()); } public Double getPagedExpandRpcTimeoutMultiplier() { @@ -339,24 +339,26 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRpcTimeout; } - public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { - this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + public void setPagedExpandMaxRpcTimeout(java.time.Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = Duration.parse(pagedExpandMaxRpcTimeout.toString()); } public Duration getPagedExpandTotalTimeout() { return this.pagedExpandTotalTimeout; } - public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { - this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + public void setPagedExpandTotalTimeout(java.time.Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = Duration.parse(pagedExpandTotalTimeout.toString()); } public Duration getSimplePagedExpandInitialRpcTimeout() { return this.simplePagedExpandInitialRpcTimeout; } - public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { - this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + public void setSimplePagedExpandInitialRpcTimeout( + java.time.Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = + Duration.parse(simplePagedExpandInitialRpcTimeout.toString()); } public Double getSimplePagedExpandRpcTimeoutMultiplier() { @@ -372,24 +374,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.simplePagedExpandMaxRpcTimeout; } - public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { - this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + public void setSimplePagedExpandMaxRpcTimeout(java.time.Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = Duration.parse(simplePagedExpandMaxRpcTimeout.toString()); } public Duration getSimplePagedExpandTotalTimeout() { return this.simplePagedExpandTotalTimeout; } - public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { - this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + public void setSimplePagedExpandTotalTimeout(java.time.Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = Duration.parse(simplePagedExpandTotalTimeout.toString()); } public Duration getWaitInitialRpcTimeout() { return this.waitInitialRpcTimeout; } - public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { - this.waitInitialRpcTimeout = waitInitialRpcTimeout; + public void setWaitInitialRpcTimeout(java.time.Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = Duration.parse(waitInitialRpcTimeout.toString()); } public Double getWaitRpcTimeoutMultiplier() { @@ -404,24 +406,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.waitMaxRpcTimeout; } - public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { - this.waitMaxRpcTimeout = waitMaxRpcTimeout; + public void setWaitMaxRpcTimeout(java.time.Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = Duration.parse(waitMaxRpcTimeout.toString()); } public Duration getWaitTotalTimeout() { return this.waitTotalTimeout; } - public void setWaitTotalTimeout(Duration waitTotalTimeout) { - this.waitTotalTimeout = waitTotalTimeout; + public void setWaitTotalTimeout(java.time.Duration waitTotalTimeout) { + this.waitTotalTimeout = Duration.parse(waitTotalTimeout.toString()); } public Duration getBlockInitialRpcTimeout() { return this.blockInitialRpcTimeout; } - public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { - this.blockInitialRpcTimeout = blockInitialRpcTimeout; + public void setBlockInitialRpcTimeout(java.time.Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = Duration.parse(blockInitialRpcTimeout.toString()); } public Double getBlockRpcTimeoutMultiplier() { @@ -436,24 +438,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.blockMaxRpcTimeout; } - public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { - this.blockMaxRpcTimeout = blockMaxRpcTimeout; + public void setBlockMaxRpcTimeout(java.time.Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = Duration.parse(blockMaxRpcTimeout.toString()); } public Duration getBlockTotalTimeout() { return this.blockTotalTimeout; } - public void setBlockTotalTimeout(Duration blockTotalTimeout) { - this.blockTotalTimeout = blockTotalTimeout; + public void setBlockTotalTimeout(java.time.Duration blockTotalTimeout) { + this.blockTotalTimeout = Duration.parse(blockTotalTimeout.toString()); } public Duration getCollideNameInitialRpcTimeout() { return this.collideNameInitialRpcTimeout; } - public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { - this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + public void setCollideNameInitialRpcTimeout(java.time.Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = Duration.parse(collideNameInitialRpcTimeout.toString()); } public Double getCollideNameRpcTimeoutMultiplier() { @@ -468,15 +470,15 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collideNameMaxRpcTimeout; } - public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { - this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + public void setCollideNameMaxRpcTimeout(java.time.Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = Duration.parse(collideNameMaxRpcTimeout.toString()); } public Duration getCollideNameTotalTimeout() { return this.collideNameTotalTimeout; } - public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { - this.collideNameTotalTimeout = collideNameTotalTimeout; + public void setCollideNameTotalTimeout(java.time.Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = Duration.parse(collideNameTotalTimeout.toString()); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden index 55d8a0f23c..9769910645 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringPropertiesGrpcRest.golden @@ -100,8 +100,8 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoInitialRetryDelay; } - public void setEchoInitialRetryDelay(Duration echoInitialRetryDelay) { - this.echoInitialRetryDelay = echoInitialRetryDelay; + public void setEchoInitialRetryDelay(java.time.Duration echoInitialRetryDelay) { + this.echoInitialRetryDelay = Duration.parse(echoInitialRetryDelay.toString()); } public Double getEchoRetryDelayMultiplier() { @@ -116,16 +116,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRetryDelay; } - public void setEchoMaxRetryDelay(Duration echoMaxRetryDelay) { - this.echoMaxRetryDelay = echoMaxRetryDelay; + public void setEchoMaxRetryDelay(java.time.Duration echoMaxRetryDelay) { + this.echoMaxRetryDelay = Duration.parse(echoMaxRetryDelay.toString()); } public Duration getEchoInitialRpcTimeout() { return this.echoInitialRpcTimeout; } - public void setEchoInitialRpcTimeout(Duration echoInitialRpcTimeout) { - this.echoInitialRpcTimeout = echoInitialRpcTimeout; + public void setEchoInitialRpcTimeout(java.time.Duration echoInitialRpcTimeout) { + this.echoInitialRpcTimeout = Duration.parse(echoInitialRpcTimeout.toString()); } public Double getEchoRpcTimeoutMultiplier() { @@ -140,24 +140,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.echoMaxRpcTimeout; } - public void setEchoMaxRpcTimeout(Duration echoMaxRpcTimeout) { - this.echoMaxRpcTimeout = echoMaxRpcTimeout; + public void setEchoMaxRpcTimeout(java.time.Duration echoMaxRpcTimeout) { + this.echoMaxRpcTimeout = Duration.parse(echoMaxRpcTimeout.toString()); } public Duration getEchoTotalTimeout() { return this.echoTotalTimeout; } - public void setEchoTotalTimeout(Duration echoTotalTimeout) { - this.echoTotalTimeout = echoTotalTimeout; + public void setEchoTotalTimeout(java.time.Duration echoTotalTimeout) { + this.echoTotalTimeout = Duration.parse(echoTotalTimeout.toString()); } public Duration getExpandInitialRetryDelay() { return this.expandInitialRetryDelay; } - public void setExpandInitialRetryDelay(Duration expandInitialRetryDelay) { - this.expandInitialRetryDelay = expandInitialRetryDelay; + public void setExpandInitialRetryDelay(java.time.Duration expandInitialRetryDelay) { + this.expandInitialRetryDelay = Duration.parse(expandInitialRetryDelay.toString()); } public Double getExpandRetryDelayMultiplier() { @@ -172,16 +172,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRetryDelay; } - public void setExpandMaxRetryDelay(Duration expandMaxRetryDelay) { - this.expandMaxRetryDelay = expandMaxRetryDelay; + public void setExpandMaxRetryDelay(java.time.Duration expandMaxRetryDelay) { + this.expandMaxRetryDelay = Duration.parse(expandMaxRetryDelay.toString()); } public Duration getExpandInitialRpcTimeout() { return this.expandInitialRpcTimeout; } - public void setExpandInitialRpcTimeout(Duration expandInitialRpcTimeout) { - this.expandInitialRpcTimeout = expandInitialRpcTimeout; + public void setExpandInitialRpcTimeout(java.time.Duration expandInitialRpcTimeout) { + this.expandInitialRpcTimeout = Duration.parse(expandInitialRpcTimeout.toString()); } public Double getExpandRpcTimeoutMultiplier() { @@ -196,24 +196,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.expandMaxRpcTimeout; } - public void setExpandMaxRpcTimeout(Duration expandMaxRpcTimeout) { - this.expandMaxRpcTimeout = expandMaxRpcTimeout; + public void setExpandMaxRpcTimeout(java.time.Duration expandMaxRpcTimeout) { + this.expandMaxRpcTimeout = Duration.parse(expandMaxRpcTimeout.toString()); } public Duration getExpandTotalTimeout() { return this.expandTotalTimeout; } - public void setExpandTotalTimeout(Duration expandTotalTimeout) { - this.expandTotalTimeout = expandTotalTimeout; + public void setExpandTotalTimeout(java.time.Duration expandTotalTimeout) { + this.expandTotalTimeout = Duration.parse(expandTotalTimeout.toString()); } public Duration getCollectInitialRpcTimeout() { return this.collectInitialRpcTimeout; } - public void setCollectInitialRpcTimeout(Duration collectInitialRpcTimeout) { - this.collectInitialRpcTimeout = collectInitialRpcTimeout; + public void setCollectInitialRpcTimeout(java.time.Duration collectInitialRpcTimeout) { + this.collectInitialRpcTimeout = Duration.parse(collectInitialRpcTimeout.toString()); } public Double getCollectRpcTimeoutMultiplier() { @@ -228,24 +228,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collectMaxRpcTimeout; } - public void setCollectMaxRpcTimeout(Duration collectMaxRpcTimeout) { - this.collectMaxRpcTimeout = collectMaxRpcTimeout; + public void setCollectMaxRpcTimeout(java.time.Duration collectMaxRpcTimeout) { + this.collectMaxRpcTimeout = Duration.parse(collectMaxRpcTimeout.toString()); } public Duration getCollectTotalTimeout() { return this.collectTotalTimeout; } - public void setCollectTotalTimeout(Duration collectTotalTimeout) { - this.collectTotalTimeout = collectTotalTimeout; + public void setCollectTotalTimeout(java.time.Duration collectTotalTimeout) { + this.collectTotalTimeout = Duration.parse(collectTotalTimeout.toString()); } public Duration getChatInitialRpcTimeout() { return this.chatInitialRpcTimeout; } - public void setChatInitialRpcTimeout(Duration chatInitialRpcTimeout) { - this.chatInitialRpcTimeout = chatInitialRpcTimeout; + public void setChatInitialRpcTimeout(java.time.Duration chatInitialRpcTimeout) { + this.chatInitialRpcTimeout = Duration.parse(chatInitialRpcTimeout.toString()); } public Double getChatRpcTimeoutMultiplier() { @@ -260,24 +260,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatMaxRpcTimeout; } - public void setChatMaxRpcTimeout(Duration chatMaxRpcTimeout) { - this.chatMaxRpcTimeout = chatMaxRpcTimeout; + public void setChatMaxRpcTimeout(java.time.Duration chatMaxRpcTimeout) { + this.chatMaxRpcTimeout = Duration.parse(chatMaxRpcTimeout.toString()); } public Duration getChatTotalTimeout() { return this.chatTotalTimeout; } - public void setChatTotalTimeout(Duration chatTotalTimeout) { - this.chatTotalTimeout = chatTotalTimeout; + public void setChatTotalTimeout(java.time.Duration chatTotalTimeout) { + this.chatTotalTimeout = Duration.parse(chatTotalTimeout.toString()); } public Duration getChatAgainInitialRpcTimeout() { return this.chatAgainInitialRpcTimeout; } - public void setChatAgainInitialRpcTimeout(Duration chatAgainInitialRpcTimeout) { - this.chatAgainInitialRpcTimeout = chatAgainInitialRpcTimeout; + public void setChatAgainInitialRpcTimeout(java.time.Duration chatAgainInitialRpcTimeout) { + this.chatAgainInitialRpcTimeout = Duration.parse(chatAgainInitialRpcTimeout.toString()); } public Double getChatAgainRpcTimeoutMultiplier() { @@ -292,24 +292,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.chatAgainMaxRpcTimeout; } - public void setChatAgainMaxRpcTimeout(Duration chatAgainMaxRpcTimeout) { - this.chatAgainMaxRpcTimeout = chatAgainMaxRpcTimeout; + public void setChatAgainMaxRpcTimeout(java.time.Duration chatAgainMaxRpcTimeout) { + this.chatAgainMaxRpcTimeout = Duration.parse(chatAgainMaxRpcTimeout.toString()); } public Duration getChatAgainTotalTimeout() { return this.chatAgainTotalTimeout; } - public void setChatAgainTotalTimeout(Duration chatAgainTotalTimeout) { - this.chatAgainTotalTimeout = chatAgainTotalTimeout; + public void setChatAgainTotalTimeout(java.time.Duration chatAgainTotalTimeout) { + this.chatAgainTotalTimeout = Duration.parse(chatAgainTotalTimeout.toString()); } public Duration getPagedExpandInitialRetryDelay() { return this.pagedExpandInitialRetryDelay; } - public void setPagedExpandInitialRetryDelay(Duration pagedExpandInitialRetryDelay) { - this.pagedExpandInitialRetryDelay = pagedExpandInitialRetryDelay; + public void setPagedExpandInitialRetryDelay(java.time.Duration pagedExpandInitialRetryDelay) { + this.pagedExpandInitialRetryDelay = Duration.parse(pagedExpandInitialRetryDelay.toString()); } public Double getPagedExpandRetryDelayMultiplier() { @@ -324,16 +324,16 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRetryDelay; } - public void setPagedExpandMaxRetryDelay(Duration pagedExpandMaxRetryDelay) { - this.pagedExpandMaxRetryDelay = pagedExpandMaxRetryDelay; + public void setPagedExpandMaxRetryDelay(java.time.Duration pagedExpandMaxRetryDelay) { + this.pagedExpandMaxRetryDelay = Duration.parse(pagedExpandMaxRetryDelay.toString()); } public Duration getPagedExpandInitialRpcTimeout() { return this.pagedExpandInitialRpcTimeout; } - public void setPagedExpandInitialRpcTimeout(Duration pagedExpandInitialRpcTimeout) { - this.pagedExpandInitialRpcTimeout = pagedExpandInitialRpcTimeout; + public void setPagedExpandInitialRpcTimeout(java.time.Duration pagedExpandInitialRpcTimeout) { + this.pagedExpandInitialRpcTimeout = Duration.parse(pagedExpandInitialRpcTimeout.toString()); } public Double getPagedExpandRpcTimeoutMultiplier() { @@ -348,24 +348,26 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.pagedExpandMaxRpcTimeout; } - public void setPagedExpandMaxRpcTimeout(Duration pagedExpandMaxRpcTimeout) { - this.pagedExpandMaxRpcTimeout = pagedExpandMaxRpcTimeout; + public void setPagedExpandMaxRpcTimeout(java.time.Duration pagedExpandMaxRpcTimeout) { + this.pagedExpandMaxRpcTimeout = Duration.parse(pagedExpandMaxRpcTimeout.toString()); } public Duration getPagedExpandTotalTimeout() { return this.pagedExpandTotalTimeout; } - public void setPagedExpandTotalTimeout(Duration pagedExpandTotalTimeout) { - this.pagedExpandTotalTimeout = pagedExpandTotalTimeout; + public void setPagedExpandTotalTimeout(java.time.Duration pagedExpandTotalTimeout) { + this.pagedExpandTotalTimeout = Duration.parse(pagedExpandTotalTimeout.toString()); } public Duration getSimplePagedExpandInitialRpcTimeout() { return this.simplePagedExpandInitialRpcTimeout; } - public void setSimplePagedExpandInitialRpcTimeout(Duration simplePagedExpandInitialRpcTimeout) { - this.simplePagedExpandInitialRpcTimeout = simplePagedExpandInitialRpcTimeout; + public void setSimplePagedExpandInitialRpcTimeout( + java.time.Duration simplePagedExpandInitialRpcTimeout) { + this.simplePagedExpandInitialRpcTimeout = + Duration.parse(simplePagedExpandInitialRpcTimeout.toString()); } public Double getSimplePagedExpandRpcTimeoutMultiplier() { @@ -381,24 +383,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.simplePagedExpandMaxRpcTimeout; } - public void setSimplePagedExpandMaxRpcTimeout(Duration simplePagedExpandMaxRpcTimeout) { - this.simplePagedExpandMaxRpcTimeout = simplePagedExpandMaxRpcTimeout; + public void setSimplePagedExpandMaxRpcTimeout(java.time.Duration simplePagedExpandMaxRpcTimeout) { + this.simplePagedExpandMaxRpcTimeout = Duration.parse(simplePagedExpandMaxRpcTimeout.toString()); } public Duration getSimplePagedExpandTotalTimeout() { return this.simplePagedExpandTotalTimeout; } - public void setSimplePagedExpandTotalTimeout(Duration simplePagedExpandTotalTimeout) { - this.simplePagedExpandTotalTimeout = simplePagedExpandTotalTimeout; + public void setSimplePagedExpandTotalTimeout(java.time.Duration simplePagedExpandTotalTimeout) { + this.simplePagedExpandTotalTimeout = Duration.parse(simplePagedExpandTotalTimeout.toString()); } public Duration getWaitInitialRpcTimeout() { return this.waitInitialRpcTimeout; } - public void setWaitInitialRpcTimeout(Duration waitInitialRpcTimeout) { - this.waitInitialRpcTimeout = waitInitialRpcTimeout; + public void setWaitInitialRpcTimeout(java.time.Duration waitInitialRpcTimeout) { + this.waitInitialRpcTimeout = Duration.parse(waitInitialRpcTimeout.toString()); } public Double getWaitRpcTimeoutMultiplier() { @@ -413,24 +415,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.waitMaxRpcTimeout; } - public void setWaitMaxRpcTimeout(Duration waitMaxRpcTimeout) { - this.waitMaxRpcTimeout = waitMaxRpcTimeout; + public void setWaitMaxRpcTimeout(java.time.Duration waitMaxRpcTimeout) { + this.waitMaxRpcTimeout = Duration.parse(waitMaxRpcTimeout.toString()); } public Duration getWaitTotalTimeout() { return this.waitTotalTimeout; } - public void setWaitTotalTimeout(Duration waitTotalTimeout) { - this.waitTotalTimeout = waitTotalTimeout; + public void setWaitTotalTimeout(java.time.Duration waitTotalTimeout) { + this.waitTotalTimeout = Duration.parse(waitTotalTimeout.toString()); } public Duration getBlockInitialRpcTimeout() { return this.blockInitialRpcTimeout; } - public void setBlockInitialRpcTimeout(Duration blockInitialRpcTimeout) { - this.blockInitialRpcTimeout = blockInitialRpcTimeout; + public void setBlockInitialRpcTimeout(java.time.Duration blockInitialRpcTimeout) { + this.blockInitialRpcTimeout = Duration.parse(blockInitialRpcTimeout.toString()); } public Double getBlockRpcTimeoutMultiplier() { @@ -445,24 +447,24 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.blockMaxRpcTimeout; } - public void setBlockMaxRpcTimeout(Duration blockMaxRpcTimeout) { - this.blockMaxRpcTimeout = blockMaxRpcTimeout; + public void setBlockMaxRpcTimeout(java.time.Duration blockMaxRpcTimeout) { + this.blockMaxRpcTimeout = Duration.parse(blockMaxRpcTimeout.toString()); } public Duration getBlockTotalTimeout() { return this.blockTotalTimeout; } - public void setBlockTotalTimeout(Duration blockTotalTimeout) { - this.blockTotalTimeout = blockTotalTimeout; + public void setBlockTotalTimeout(java.time.Duration blockTotalTimeout) { + this.blockTotalTimeout = Duration.parse(blockTotalTimeout.toString()); } public Duration getCollideNameInitialRpcTimeout() { return this.collideNameInitialRpcTimeout; } - public void setCollideNameInitialRpcTimeout(Duration collideNameInitialRpcTimeout) { - this.collideNameInitialRpcTimeout = collideNameInitialRpcTimeout; + public void setCollideNameInitialRpcTimeout(java.time.Duration collideNameInitialRpcTimeout) { + this.collideNameInitialRpcTimeout = Duration.parse(collideNameInitialRpcTimeout.toString()); } public Double getCollideNameRpcTimeoutMultiplier() { @@ -477,15 +479,15 @@ public class EchoSpringProperties implements CredentialsSupplier { return this.collideNameMaxRpcTimeout; } - public void setCollideNameMaxRpcTimeout(Duration collideNameMaxRpcTimeout) { - this.collideNameMaxRpcTimeout = collideNameMaxRpcTimeout; + public void setCollideNameMaxRpcTimeout(java.time.Duration collideNameMaxRpcTimeout) { + this.collideNameMaxRpcTimeout = Duration.parse(collideNameMaxRpcTimeout.toString()); } public Duration getCollideNameTotalTimeout() { return this.collideNameTotalTimeout; } - public void setCollideNameTotalTimeout(Duration collideNameTotalTimeout) { - this.collideNameTotalTimeout = collideNameTotalTimeout; + public void setCollideNameTotalTimeout(java.time.Duration collideNameTotalTimeout) { + this.collideNameTotalTimeout = Duration.parse(collideNameTotalTimeout.toString()); } } From f877870804c5f60c2f42aa151921fbaaf65a5183 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Wed, 16 Nov 2022 15:12:37 -0500 Subject: [PATCH 075/103] feat(bazel): detach spring bazel rules (#1065) * feat(bazel): initial separation of rules * fix(bazel): remove unused elements from copied rls * fix(bazel): remove unnecessary rule input * feat(bazel): complete separation, spring postproc * feat: copyright for spring main * fix: restore `transport` argument to spring bazel rule * fix: postprocessing to include pom, add grpc service config * Update rules_java_gapic/java_gapic_spring.bzl Co-authored-by: Emily Wang Co-authored-by: Emily Wang --- BUILD.bazel | 6 + rules_java_gapic/java_gapic.bzl | 78 +--------- rules_java_gapic/java_gapic_spring.bzl | 146 ++++++++++++++++++ .../com/google/api/generator/spring/Main.java | 31 ++++ 4 files changed, 184 insertions(+), 77 deletions(-) create mode 100644 rules_java_gapic/java_gapic_spring.bzl create mode 100644 src/main/java/com/google/api/generator/spring/Main.java diff --git a/BUILD.bazel b/BUILD.bazel index e8e17887a3..ec0ea39f63 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -115,6 +115,12 @@ java_binary( runtime_deps = [":gapic_generator_java"] + MAIN_DEPS, ) +java_binary( + name = "protoc-gen-java_gapic_spring", + main_class = "com.google.api.generator.spring.Main", + runtime_deps = [":gapic_generator_java"] + MAIN_DEPS, +) + # Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk # which will be identical to the one passed to the protoc-gen-java_gapic during # normal execution. The dumped file then can be used to run this gapic-generator diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index e5d70b978f..8f2d620739 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -22,7 +22,6 @@ def _java_gapic_postprocess_srcjar_impl(ctx): output_main = ctx.outputs.main output_test = ctx.outputs.test output_samples = ctx.outputs.samples - output_spring = ctx.outputs.spring output_resource_name = ctx.outputs.resource_name formatter = ctx.executable.formatter @@ -66,21 +65,10 @@ def _java_gapic_postprocess_srcjar_impl(ctx): cd $WORKING_DIR - unzip -q temp-codegen-spring.srcjar -d {output_dir_path}/spring - # This may fail if there are spaces and/or too many files (exceed max length of command length). - {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ") - - # Spring source files. - cd {output_dir_path}/spring - zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ - - cd $WORKING_DIR - mv {output_srcjar_name}.srcjar {output_main} mv {output_srcjar_name}-resource-name.srcjar {output_resource_name} mv {output_srcjar_name}-tests.srcjar {output_test} mv {output_srcjar_name}-samples.srcjar {output_samples} - mv {output_srcjar_name}-spring.srcjar {output_spring} """.format( gapic_srcjar = gapic_srcjar.path, output_srcjar_name = output_srcjar_name, @@ -91,14 +79,13 @@ def _java_gapic_postprocess_srcjar_impl(ctx): output_resource_name = output_resource_name.path, output_test = output_test.path, output_samples = output_samples.path, - output_spring = output_spring.path, ) ctx.actions.run_shell( inputs = [gapic_srcjar], tools = [formatter], command = script, - outputs = [output_main, output_resource_name, output_test, output_samples, output_spring], + outputs = [output_main, output_resource_name, output_test, output_samples], ) _java_gapic_postprocess_srcjar = rule( @@ -115,7 +102,6 @@ _java_gapic_postprocess_srcjar = rule( "resource_name": "%{name}-resource-name.srcjar", "test": "%{name}-test.srcjar", "samples": "%{name}-samples.srcjar", - "spring": "%{name}-spring.srcjar", }, implementation = _java_gapic_postprocess_srcjar_impl, ) @@ -175,62 +161,6 @@ _java_gapic_samples_srcjar = rule( implementation = _java_gapic_samples_srcjar_impl, ) - -def _java_gapic_spring_srcjar_impl(ctx): - gapic_srcjar = ctx.file.gapic_srcjar - output_srcjar_name = ctx.label.name - output_spring = ctx.outputs.spring - formatter = ctx.executable.formatter - - output_dir_name = ctx.label.name - output_dir_path = "%s/%s" % (output_spring.dirname, output_dir_name) - - script = """ - unzip -q {gapic_srcjar} - # Sync'd to the output file name in Writer.java. - unzip -q temp-codegen-spring.srcjar -d {output_dir_path} - # This may fail if there are spaces and/or too many files (exceed max length of command length). - {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ") - WORKING_DIR=`pwd` - - # Spring source files. - cd $WORKING_DIR/{output_dir_path} - zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./ - - cd $WORKING_DIR - - mv {output_srcjar_name}-spring.srcjar {output_spring} - """.format( - gapic_srcjar = gapic_srcjar.path, - output_srcjar_name = output_srcjar_name, - formatter = formatter, - output_dir_name = output_dir_name, - output_dir_path = output_dir_path, - output_spring = output_spring.path, - ) - - ctx.actions.run_shell( - inputs = [gapic_srcjar], - tools = [formatter], - command = script, - outputs = [output_spring], - ) - -_java_gapic_spring_srcjar = rule( - attrs = { - "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True), - "formatter": attr.label( - default = Label("//:google_java_format_binary"), - executable = True, - cfg = "host", - ), - }, - outputs = { - "spring": "%{name}-spring.srcjar", - }, - implementation = _java_gapic_spring_srcjar_impl, -) - def _extract_common_proto_dep(dep): return dep[dep.index("/"):] if "//google" in dep else dep @@ -343,12 +273,6 @@ def java_gapic_library( **kwargs ) - _java_gapic_spring_srcjar( - name = "%s_spring" % name, - gapic_srcjar = "%s.srcjar" % raw_srcjar_name, - **kwargs - ) - print("postprocessing done.\n") resource_name_name = "%s_resource_name" % name diff --git a/rules_java_gapic/java_gapic_spring.bzl b/rules_java_gapic/java_gapic_spring.bzl new file mode 100644 index 0000000000..e18914f3a0 --- /dev/null +++ b/rules_java_gapic/java_gapic_spring.bzl @@ -0,0 +1,146 @@ +# 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 +# +# https://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. + +load("@rules_gapic//:gapic.bzl", "proto_custom_library") + +def _java_gapic_spring_postprocess_srcjar_impl(ctx): + gapic_srcjar = ctx.file.gapic_srcjar + output_srcjar_name = ctx.label.name + srcjar_name = output_srcjar_name + "_raw.srcjar" + output_spring = ctx.outputs.spring + formatter = ctx.executable.formatter + + output_dir_name = ctx.label.name + output_dir_path = "%s/%s" % (output_spring.dirname, output_dir_name) + + script = """ + WORKING_DIR=`pwd` + cd $WORKING_DIR + unzip -q {gapic_srcjar} + unzip -q temp-codegen-spring.srcjar -d {output_dir_path} + # This may fail if there are spaces and/or too many files (exceed max length of command length). + {formatter} --replace $(find {output_dir_path} -type f -printf "%p ") + + # Spring source files. + cd {output_dir_path} + zip -r $WORKING_DIR/{output_srcjar_name}.srcjar ./ + + cd $WORKING_DIR + + mv $WORKING_DIR/{output_srcjar_name}.srcjar {output_spring} + """.format( + output_srcjar_name = output_srcjar_name, + gapic_srcjar = gapic_srcjar.path, + srcjar_name = srcjar_name, + formatter = formatter, + output_dir_name = output_dir_name, + output_dir_path = output_dir_path, + output_spring = output_spring.path, + ) + + ctx.actions.run_shell( + inputs = [gapic_srcjar], + tools = [formatter], + command = script, + outputs = [output_spring], + ) + +_java_gapic_spring_postprocess_srcjar = rule( + attrs = { + "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True), + "formatter": attr.label( + default = Label("//:google_java_format_binary"), + executable = True, + cfg = "host", + ), + }, + outputs = { + "spring": "%{name}-spring.srcjar", + }, + implementation = _java_gapic_spring_postprocess_srcjar_impl, +) + +def java_gapic_spring_library( + name, + srcs, + grpc_service_config = None, + gapic_yaml = None, + service_yaml = None, + transport = None, + **kwargs): + library_name = name + "-spring" + raw_srcjar_name = name + "_raw" + + _java_gapic_spring_srcjar( + name = raw_srcjar_name, + srcs = srcs, + grpc_service_config = grpc_service_config, + gapic_yaml = gapic_yaml, + service_yaml = service_yaml, + transport = transport, + **kwargs + ) + + _java_gapic_spring_postprocess_srcjar( + name = name, + gapic_srcjar = "%s.srcjar" % raw_srcjar_name, + **kwargs + ) + +def _java_gapic_spring_srcjar( + name, + srcs, + grpc_service_config, + gapic_yaml, + service_yaml, + transport, + # Can be used to provide a java_library with a customized generator, + # like the one which dumps descriptor to a file for future debugging. + java_generator_name = "java_gapic_spring", + **kwargs): + file_args_dict = {} + + if grpc_service_config: + file_args_dict[grpc_service_config] = "grpc-service-config" + elif not transport or transport == "grpc": + if "library" not in name: + fail("Missing a gRPC service config file") + + if gapic_yaml: + file_args_dict[gapic_yaml] = "gapic-config" + + if service_yaml: + file_args_dict[service_yaml] = "api-service-config" + + opt_args = [] + + if transport: + opt_args.append("transport=%s" % transport) + + # Produces the GAPIC metadata file if this flag is set. to any value. + # Protoc invocation: --java_gapic_opt=metadata + plugin_args = ["metadata"] + + proto_custom_library( + name = name, + deps = srcs, + plugin = Label("@gapic_generator_java//:protoc-gen-%s" % java_generator_name), + plugin_args = plugin_args, + plugin_file_args = {}, + opt_file_args = file_args_dict, + output_type = java_generator_name, + output_suffix = ".srcjar", + opt_args = opt_args, + **kwargs + ) diff --git a/src/main/java/com/google/api/generator/spring/Main.java b/src/main/java/com/google/api/generator/spring/Main.java new file mode 100644 index 0000000000..ce17171335 --- /dev/null +++ b/src/main/java/com/google/api/generator/spring/Main.java @@ -0,0 +1,31 @@ +// 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.spring; + +import com.google.api.generator.ProtoRegistry; +import com.google.protobuf.ExtensionRegistry; +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; +import java.io.IOException; + +public class Main { + public static void main(String[] args) throws IOException { + ExtensionRegistry registry = ExtensionRegistry.newInstance(); + ProtoRegistry.registerAllExtensions(registry); + CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry); + CodeGeneratorResponse springResponse = SpringGenerator.generateSpring(request); + springResponse.writeTo(System.out); + } +} From 0f7d5803dbec24322d6eb321a4be1b1e64ec14be Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 17 Nov 2022 13:32:16 -0500 Subject: [PATCH 076/103] fix(spring): add parent and remove maven-jar-plugin from pom string. (#1096) Two changes: - add parent to generated module: `generated-parent`. This parent pom is manually created in [`spring-cloud-gcp/generated`](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/main/generated/pom.xml). In general, parent pom coordinate is not expected to change. - remove unnecessary `maven-jar-plugin` as module will inherit from spring parent. --- .../api/generator/spring/SpringWriter.java | 29 +++---------------- .../spring/goldens/SpringPackagePom.golden | 29 +++---------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index 77dc05989d..a41544bdcf 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -221,6 +221,10 @@ static String buildPomString(GapicContext context) { + " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" + " 4.0.0\n" + "\n" + + " \n" + + " com.google.cloud\n" + + " generated-parent\n" + + " \n" + " com.google.cloud\n" + " %s\n" + " %s\n" @@ -247,31 +251,6 @@ static String buildPomString(GapicContext context) { + " 3.2.1\n" + " \n" + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " org.apache.maven.plugins\n" - + " maven-jar-plugin\n" - + " 3.2.2\n" - + " \n" - + " \n" - + " \n" - + "\n" - + " \n" - + " \n" - + " org.apache.maven.plugins\n" - + " maven-jar-plugin\n" - + " \n" - + " \n" - + " \n" - + " true\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" + "\n" + "", springStarterArtifactId, diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden index b6b2632c24..7f19e17b3e 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -3,6 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + com.google.cloud + generated-parent + com.google.cloud {{client-library-artifact-id}}-spring-starter {{starter-version}} @@ -29,30 +33,5 @@ 3.2.1 - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.2 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - - - - - \ No newline at end of file From 13290c2807cd8c5b89887b9aab0fb7f8e3195c1e Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Fri, 18 Nov 2022 09:18:52 -0500 Subject: [PATCH 077/103] fix(spring): eliminate raw-types and remove unnecessary cast (#1095) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(deps): update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.6 (#1088) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `3.0.5` -> `3.0.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/compatibility-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/3.0.6/confidence-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

googleapis/java-shared-dependencies ### [`v3.0.6`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​306-httpsgithubcomgoogleapisjava-shared-dependenciescomparev305v306-2022-11-07) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v3.0.5...v3.0.6) ##### Dependencies - Update dependency com.fasterxml.jackson:jackson-bom to v2.14.0 ([#​901](https://togithub.com/googleapis/java-shared-dependencies/issues/901)) ([33c5511](https://togithub.com/googleapis/java-shared-dependencies/commit/33c55112ff485da1d7a0a32d8b6dade33aa04ff8)) - Update dependency com.google.api-client:google-api-client-bom to v2.0.1 ([#​899](https://togithub.com/googleapis/java-shared-dependencies/issues/899)) ([4029e89](https://togithub.com/googleapis/java-shared-dependencies/commit/4029e89be507ddfa030515565fdb6fbf8997324e)) - Update dependency com.google.api:api-common to v2.2.2 ([#​892](https://togithub.com/googleapis/java-shared-dependencies/issues/892)) ([5c59fbd](https://togithub.com/googleapis/java-shared-dependencies/commit/5c59fbd3c3cf3efbfda50420c8048e3ff257084c)) - Update dependency com.google.cloud:grpc-gcp to v1.3.1 ([#​884](https://togithub.com/googleapis/java-shared-dependencies/issues/884)) ([9fffe24](https://togithub.com/googleapis/java-shared-dependencies/commit/9fffe243b631565a00b0a848a6c73163b1dd33a4)) - Update dependency com.google.code.gson:gson to v2.10 ([#​887](https://togithub.com/googleapis/java-shared-dependencies/issues/887)) ([15017de](https://togithub.com/googleapis/java-shared-dependencies/commit/15017de39a35f90bc1b38b828edc23fdce524a07)) - Update dependency com.google.http-client:google-http-client-bom to v1.42.3 ([#​893](https://togithub.com/googleapis/java-shared-dependencies/issues/893)) ([4c0de9b](https://togithub.com/googleapis/java-shared-dependencies/commit/4c0de9bd188bfab5fe126c8b01b4d7168f8a5079)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#​889](https://togithub.com/googleapis/java-shared-dependencies/issues/889)) ([8576271](https://togithub.com/googleapis/java-shared-dependencies/commit/85762716d1bbb97c447f86451094fb8af2528470)) - Update dependency io.grpc:grpc-bom to v1.50.2 ([#​878](https://togithub.com/googleapis/java-shared-dependencies/issues/878)) ([fd569af](https://togithub.com/googleapis/java-shared-dependencies/commit/fd569af1e5f1b195e2421fc9e02d8b67afe1c638)) - Update dependency org.checkerframework:checker-qual to v3.27.0 ([#​896](https://togithub.com/googleapis/java-shared-dependencies/issues/896)) ([f0f7931](https://togithub.com/googleapis/java-shared-dependencies/commit/f0f7931937a0ed9a32fd87cd58c82b787d368242)) - Update dependency org.threeten:threetenbp to v1.6.4 ([#​894](https://togithub.com/googleapis/java-shared-dependencies/issues/894)) ([899682d](https://togithub.com/googleapis/java-shared-dependencies/commit/899682d0405645d9d5288b298af2fda228414669)) - Update gax.version to v2.19.5 ([#​903](https://togithub.com/googleapis/java-shared-dependencies/issues/903)) ([3e4d8b3](https://togithub.com/googleapis/java-shared-dependencies/commit/3e4d8b35d3f682b07326ffa0a3e552d097f25a65)) - Update google.common-protos.version to v2.10.0 ([#​900](https://togithub.com/googleapis/java-shared-dependencies/issues/900)) ([53b54c3](https://togithub.com/googleapis/java-shared-dependencies/commit/53b54c35f3a7c19df488921a6077e7a9bfb0b103)) - Update google.core.version to v2.8.23 ([#​885](https://togithub.com/googleapis/java-shared-dependencies/issues/885)) ([686dd7c](https://togithub.com/googleapis/java-shared-dependencies/commit/686dd7c8f541189302e8cac4ae72ed7d967b5b3f)) - Update google.core.version to v2.8.24 ([#​890](https://togithub.com/googleapis/java-shared-dependencies/issues/890)) ([1effda3](https://togithub.com/googleapis/java-shared-dependencies/commit/1effda381c7b886f5ae4d2dac9473da821e655fe)) - Update google.core.version to v2.8.27 ([#​902](https://togithub.com/googleapis/java-shared-dependencies/issues/902)) ([3bcb804](https://togithub.com/googleapis/java-shared-dependencies/commit/3bcb804dec4358ed0a9c6c35cf4c35f817821e9a)) - Update iam.version to v1.6.6 ([#​886](https://togithub.com/googleapis/java-shared-dependencies/issues/886)) ([03d0690](https://togithub.com/googleapis/java-shared-dependencies/commit/03d0690f01f9217e31dd65d55c28a47f2f2deb22)) - Update iam.version to v1.6.7 ([#​895](https://togithub.com/googleapis/java-shared-dependencies/issues/895)) ([6cebc20](https://togithub.com/googleapis/java-shared-dependencies/commit/6cebc205daa98b96a8b27b3fc3cd222319b27e59))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * chore(deps): update dependency kr.motd.maven:os-maven-plugin to v1.7.1 (#1087) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [kr.motd.maven:os-maven-plugin](https://togithub.com/trustin/os-maven-plugin) | `1.7.0` -> `1.7.1` | [![age](https://badges.renovateapi.com/packages/maven/kr.motd.maven:os-maven-plugin/1.7.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/kr.motd.maven:os-maven-plugin/1.7.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/kr.motd.maven:os-maven-plugin/1.7.1/compatibility-slim/1.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/kr.motd.maven:os-maven-plugin/1.7.1/confidence-slim/1.7.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * fix: eliminate raw-types and remove unnecessary cast * fix(spring): eliminate raw-types and remove unnecessary cast Co-authored-by: Mend Renovate --- pom.xml | 4 ++-- .../composer/SpringAutoConfigClassComposer.java | 5 +++-- .../composer/SpringPropertiesClassComposer.java | 13 ++++++------- .../google/api/generator/spring/utils/Utils.java | 11 ++++++----- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 76416d39da..a9f45412ad 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.5 + 3.0.6 pom import @@ -27,7 +27,7 @@ kr.motd.maven os-maven-plugin - 1.7.0 + 1.7.1 diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 1a97af96c7..aaeab40ab8 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -65,6 +65,7 @@ import java.util.stream.Collectors; public class SpringAutoConfigClassComposer implements ClassComposer { + private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); @@ -665,7 +666,7 @@ private static MethodDefinition createClientBeanMethod( } // retry settings for each method TypeNode thisClassType = types.get(service.name() + "AutoConfig"); - List retrySettings = + List retrySettings = Utils.processRetrySettings( service, gapicServiceConfig, @@ -876,7 +877,7 @@ private static MethodDefinition createUserAgentHeaderProviderMethod( } private static Map createStaticTypes() { - List concreteClazzes = + List> concreteClazzes = Arrays.asList( RetrySettings.class, RetrySettings.Builder diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index b3df0469d1..8ff1b716c3 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -14,12 +14,11 @@ package com.google.api.generator.spring.composer; -import static com.google.api.generator.engine.ast.NewObjectExpr.*; +import static com.google.api.generator.engine.ast.NewObjectExpr.builder; import com.google.api.gax.retrying.RetrySettings; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; -import com.google.api.generator.engine.ast.AstNode; import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.Expr; @@ -56,6 +55,7 @@ import java.util.stream.Collectors; public class SpringPropertiesClassComposer implements ClassComposer { + private static final String CLASS_NAME_PATTERN = "%sSpringProperties"; private static final Map staticTypes = createStaticTypes(); @@ -188,7 +188,7 @@ private static List createMemberVariables( // declare each retry settings with its default value. use defaults from serviceConfig TypeNode thisClassType = types.get(service.name() + "Properties"); - List retrySettings = + List retrySettings = Utils.processRetrySettings( service, serviceConfig, @@ -209,8 +209,7 @@ private static List createMemberVariables( }, (String propertyName) -> new ArrayList<>()); - statements.addAll( - retrySettings.stream().map(Statement.class::cast).collect(Collectors.toList())); + statements.addAll(retrySettings); return statements; } @@ -242,7 +241,7 @@ private static List createGetterSetters( methodDefinitions.add( createSetterMethod(thisClassType, "executorThreadCount", TypeNode.INT_OBJECT)); - List retrySettings = + List retrySettings = Utils.processRetrySettings( service, gapicServiceConfig, @@ -404,7 +403,7 @@ private static Map createDynamicTypes(Service service, String } private static Map createStaticTypes() { - List concreteClazzes = + List> concreteClazzes = Arrays.asList( RetrySettings.class, org.threeten.bp.Duration.class, java.time.Duration.class); return concreteClazzes.stream() diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index ce02532b84..5bd211cbb4 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -38,6 +38,7 @@ import java.util.function.Function; public class Utils { + private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); private static final String BRAND_NAME = "spring.cloud.gcp"; @@ -90,14 +91,14 @@ public static String getSpringPropertyPrefix(String packageName, String serviceN + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); } - public static List processRetrySettings( + public static List processRetrySettings( Service service, GapicServiceConfig gapicServiceConfig, TypeNode thisClassType, - Function> perMethodFuncBeforeSettings, - BiFunction, Expr, List> processFunc, - Function> perMethodFuncAfterSettings) { - List resultList = new ArrayList<>(); + Function> perMethodFuncBeforeSettings, + BiFunction, Expr, List> processFunc, + Function> perMethodFuncAfterSettings) { + List resultList = new ArrayList<>(); for (Method method : service.methods()) { String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, method.name()); String retryParamName = gapicServiceConfig.getRetryParamsName(service, method); From d5d626a903ccf9b20cfb53e34abbb43198c0c6c4 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Fri, 18 Nov 2022 15:03:49 -0500 Subject: [PATCH 078/103] fix(spring): fix and refactor class names for autoconfiguration and properties (#1091) * In logging code and autoconfig registration file: fixed class name from SpringAutoConfig to SpringAutoConfiguration * Also refactored class names for SpringAutoConfiguration and SpringProperties classes into utils to reduce potential inconsistency in the composer code --- .../api/generator/spring/SpringWriter.java | 3 +- .../SpringAutoConfigClassComposer.java | 70 ++++++++----------- .../SpringPropertiesClassComposer.java | 27 +++---- .../api/generator/spring/utils/Utils.java | 8 +++ .../generator/spring/SpringWriterTest.java | 2 +- .../EchoSpringAutoConfigurationFull.golden | 4 +- .../EchoSpringAutoConfigurationGrpc.golden | 4 +- ...EchoSpringAutoConfigurationGrpcRest.golden | 4 +- 8 files changed, 54 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/SpringWriter.java b/src/main/java/com/google/api/generator/spring/SpringWriter.java index a41544bdcf..91ca9dfcb8 100644 --- a/src/main/java/com/google/api/generator/spring/SpringWriter.java +++ b/src/main/java/com/google/api/generator/spring/SpringWriter.java @@ -138,7 +138,8 @@ static String buildAutoConfigRegistrationString(GapicContext context) { service -> sb.add( String.format( - "%s.spring.%sSpringAutoConfig", service.pakkage(), service.name()))); + "%s.spring.%s", + service.pakkage(), Utils.getServiceAutoConfigurationClassName(service)))); return sb.toString(); } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index aaeab40ab8..b077369db0 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -60,14 +60,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; public class SpringAutoConfigClassComposer implements ClassComposer { - - private static final String CLASS_NAME_PATTERN = "%sSpringAutoConfiguration"; - private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer(); private static final Map STATIC_TYPES = createStaticTypes(); @@ -85,7 +83,7 @@ public GapicClass generate(GapicContext context, Service service) { String serviceName = service.name(); String serviceNameLowerCamel = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); String serviceNameLowerHyphen = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName); - String className = getThisClassName(serviceName); + String className = Utils.getServiceAutoConfigurationClassName(service); String credentialsProviderName = serviceNameLowerCamel + "Credentials"; String transportChannelProviderName = "default" + serviceName + "TransportChannelProvider"; String clientName = serviceNameLowerCamel + "Client"; @@ -110,7 +108,7 @@ public GapicClass generate(GapicContext context, Service service) { .setAnnotations(createClassAnnotations(service, types)) .setMethods( Arrays.asList( - createConstructor(service.name(), className, types, thisExpr), + createConstructor(service, className, types, thisExpr), createCredentialsProviderBeanMethod( service, className, credentialsProviderName, types, thisExpr), createTransportChannelProviderBeanMethod(transportChannelProviderName, types), @@ -143,7 +141,7 @@ private static List createMemberVariables( Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") - .setType(types.get(serviceName + "Properties")) + .setType(types.get(Utils.getServicePropertiesClassName(service))) .build(); VariableExpr clientPropertiesVarExpr = VariableExpr.builder() @@ -155,22 +153,23 @@ private static List createMemberVariables( ExprStatement clientPropertiesStatement = ExprStatement.withExpr(clientPropertiesVarExpr); Statement loggerStatement = - LoggerUtils.getLoggerDeclarationExpr(serviceName + "AutoConfig", types); + LoggerUtils.getLoggerDeclarationExpr( + Utils.getServiceAutoConfigurationClassName(service), types); return Arrays.asList(clientPropertiesStatement, loggerStatement); } private static MethodDefinition createConstructor( - String serviceName, String className, Map types, Expr thisExpr) { + Service service, String className, Map types, Expr thisExpr) { VariableExpr propertiesVarExpr = VariableExpr.withVariable( Variable.builder() .setName("clientProperties") - .setType(types.get(serviceName + "Properties")) + .setType(types.get(Utils.getServicePropertiesClassName(service))) .build()); Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") - .setType(types.get(serviceName + "Properties")) + .setType(types.get(Utils.getServicePropertiesClassName(service))) .build(); // this.clientProperties = clientProperties; @@ -248,7 +247,7 @@ private static List createClassAnnotations( VariableExpr.builder() .setVariable( Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build()) - .setStaticReferenceType(types.get(service.name() + "Properties")) + .setStaticReferenceType(types.get(Utils.getServicePropertiesClassName(service))) .build()) .build(); @@ -274,7 +273,7 @@ private static MethodDefinition createCredentialsProviderBeanMethod( Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") - .setType(types.get(service.name() + "Properties")) + .setType(types.get(Utils.getServicePropertiesClassName(service))) .build(); VariableExpr thisClientProperties = @@ -505,7 +504,7 @@ private static MethodDefinition createClientBeanMethod( Variable clientPropertiesVar = Variable.builder() .setName("clientProperties") - .setType(types.get(service.name() + "Properties")) + .setType(types.get(Utils.getServicePropertiesClassName(service))) .build(); VariableExpr thisClientPropertiesVarExpr = VariableExpr.withVariable(clientPropertiesVar) @@ -665,8 +664,8 @@ private static MethodDefinition createClientBeanMethod( bodyStatements.add(setTransportChannelProviderStatement); } // retry settings for each method - TypeNode thisClassType = types.get(service.name() + "AutoConfig"); - List retrySettings = + TypeNode thisClassType = types.get(Utils.getServiceAutoConfigurationClassName(service)); + List retrySettings = Utils.processRetrySettings( service, gapicServiceConfig, @@ -777,12 +776,13 @@ private static MethodDefinition createClientBeanMethod( String methodName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, service.name()) + "Client"; - String propertiesClassName = service.name() + "Properties"; return MethodDefinition.builder() .setHeaderCommentStatements( SpringAutoconfigCommentComposer.createClientBeanComment( - service.name(), propertiesClassName, transportChannelProviderName)) + service.name(), + Utils.getServicePropertiesClassName(service), + transportChannelProviderName)) .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) @@ -895,35 +895,27 @@ private static Map createStaticTypes() { } private static Map createDynamicTypes(Service service, String packageName) { - Map typeMap = - Arrays.asList(CLASS_NAME_PATTERN).stream() - .collect( - Collectors.toMap( - p -> String.format(p, service.name()), - p -> - TypeNode.withReference( - VaporReference.builder() - .setName(String.format(p, service.name())) - .setPakkage(packageName) - .build()))); - TypeNode credentialsProvider = + Map typeMap = new HashMap<>(); + + TypeNode clientAutoconfiguration = TypeNode.withReference( VaporReference.builder() - .setName("CredentialsProvider") - .setPakkage("com.google.api.gax.core") + .setName(Utils.getServiceAutoConfigurationClassName(service)) + .setPakkage(packageName) .build()); + TypeNode clientProperties = TypeNode.withReference( VaporReference.builder() - .setName(service.name() + "SpringProperties") + .setName(Utils.getServicePropertiesClassName(service)) .setPakkage(packageName) .build()); - TypeNode clientAutoconfig = + TypeNode credentialsProvider = TypeNode.withReference( VaporReference.builder() - .setName(service.name() + "SpringAutoConfig") - .setPakkage(packageName) + .setName("CredentialsProvider") + .setPakkage("com.google.api.gax.core") .build()); TypeNode gcpProjectIdProvider = @@ -1021,9 +1013,9 @@ private static Map createDynamicTypes(Service service, String .setPakkage("org.springframework.beans.factory.annotation") .build()); + typeMap.put(Utils.getServiceAutoConfigurationClassName(service), clientAutoconfiguration); + typeMap.put(Utils.getServicePropertiesClassName(service), clientProperties); typeMap.put("CredentialsProvider", credentialsProvider); - typeMap.put(service.name() + "Properties", clientProperties); - typeMap.put(service.name() + "AutoConfig", clientAutoconfig); typeMap.put("GcpProjectIdProvider", gcpProjectIdProvider); typeMap.put("Credentials", credentials); typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider); @@ -1042,8 +1034,4 @@ private static Map createDynamicTypes(Service service, String return typeMap; } - - private static String getThisClassName(String serviceName) { - return String.format(CLASS_NAME_PATTERN, serviceName); - } } diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 8ff1b716c3..b6f0a01258 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -50,14 +50,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; public class SpringPropertiesClassComposer implements ClassComposer { - - private static final String CLASS_NAME_PATTERN = "%sSpringProperties"; - private static final Map staticTypes = createStaticTypes(); private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS"; @@ -70,7 +68,7 @@ public static SpringPropertiesClassComposer instance() { @Override public GapicClass generate(GapicContext context, Service service) { String packageName = Utils.getSpringPackageName(service.pakkage()); - String className = String.format(CLASS_NAME_PATTERN, service.name()); + String className = Utils.getServicePropertiesClassName(service); GapicServiceConfig gapicServiceConfig = context.serviceConfig(); Map types = createDynamicTypes(service, packageName); boolean hasRestOption = context.transport().equals(Transport.GRPC_REST); @@ -187,7 +185,7 @@ private static List createMemberVariables( // private static final ImmutableMap RETRY_PARAM_DEFINITIONS; // declare each retry settings with its default value. use defaults from serviceConfig - TypeNode thisClassType = types.get(service.name() + "Properties"); + TypeNode thisClassType = types.get(Utils.getServicePropertiesClassName(service)); List retrySettings = Utils.processRetrySettings( service, @@ -220,7 +218,7 @@ private static List createGetterSetters( GapicServiceConfig gapicServiceConfig, boolean hasRestOption) { - TypeNode thisClassType = types.get(service.name() + "Properties"); + TypeNode thisClassType = types.get(Utils.getServicePropertiesClassName(service)); List methodDefinitions = new ArrayList<>(); methodDefinitions.add( @@ -344,21 +342,12 @@ private static MethodDefinition createSetterMethod( } private static Map createDynamicTypes(Service service, String packageName) { - Map typeMap = - Arrays.asList(CLASS_NAME_PATTERN).stream() - .collect( - Collectors.toMap( - p -> String.format(p, service.name()), - p -> - TypeNode.withReference( - VaporReference.builder() - .setName(String.format(p, service.name())) - .setPakkage(packageName) - .build()))); + Map typeMap = new HashMap<>(); + TypeNode clientProperties = TypeNode.withReference( VaporReference.builder() - .setName(service.name() + "SpringProperties") + .setName(Utils.getServicePropertiesClassName(service)) .setPakkage(packageName) .build()); @@ -393,7 +382,7 @@ private static Map createDynamicTypes(Service service, String .setPakkage("org.springframework.boot.context.properties") .build()); - typeMap.put(service.name() + "Properties", clientProperties); + typeMap.put(Utils.getServicePropertiesClassName(service), clientProperties); typeMap.put("Credentials", credentials); typeMap.put("CredentialsSupplier", credentialsSupplier); typeMap.put("ConfigurationProperties", configurationProperties); diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index 5bd211cbb4..d605533664 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -43,6 +43,14 @@ public class Utils { private static final String BRAND_NAME = "spring.cloud.gcp"; + public static String getServiceAutoConfigurationClassName(Service service) { + return service.name() + "SpringAutoConfiguration"; + } + + public static String getServicePropertiesClassName(Service service) { + return service.name() + "SpringProperties"; + } + public static String getLibName(GapicContext context) { // Returns parsed name of client library // This should only be used in descriptive context, such as metadata and javadocs diff --git a/src/test/java/com/google/api/generator/spring/SpringWriterTest.java b/src/test/java/com/google/api/generator/spring/SpringWriterTest.java index 24369f5e12..ff7566f464 100644 --- a/src/test/java/com/google/api/generator/spring/SpringWriterTest.java +++ b/src/test/java/com/google/api/generator/spring/SpringWriterTest.java @@ -36,7 +36,7 @@ public void setUp() { @Test public void buildAutoConfigRegistrationStringTest() { String result = SpringWriter.buildAutoConfigRegistrationString(context); - String expected = "com.google.showcase.v1beta1.spring.EchoSpringAutoConfig"; + String expected = "com.google.showcase.v1beta1.spring.EchoSpringAutoConfiguration"; assertEquals(expected, result); } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index f26048224e..57e37709a5 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -63,7 +63,7 @@ import org.threeten.bp.Duration; @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; - private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfiguration.class); protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { this.clientProperties = clientProperties; @@ -97,7 +97,7 @@ public class EchoSpringAutoConfiguration { * client * *

Individual retry settings are configured as well. It will use the relevant client library's - * default retry settings when they are not specified in EchoProperties. + * default retry settings when they are not specified in EchoSpringProperties. */ @Bean @ConditionalOnMissingBean diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden index ce5f3e5509..be43d1f5ba 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -43,7 +43,7 @@ import org.threeten.bp.Duration; @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; - private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfiguration.class); protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { this.clientProperties = clientProperties; @@ -77,7 +77,7 @@ public class EchoSpringAutoConfiguration { * client * *

Individual retry settings are configured as well. It will use the relevant client library's - * default retry settings when they are not specified in EchoProperties. + * default retry settings when they are not specified in EchoSpringProperties. */ @Bean @ConditionalOnMissingBean diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden index a8c3faa1a5..9028ac55ed 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden @@ -44,7 +44,7 @@ import org.threeten.bp.Duration; @EnableConfigurationProperties(EchoSpringProperties.class) public class EchoSpringAutoConfiguration { private final EchoSpringProperties clientProperties; - private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfig.class); + private static final Log LOGGER = LogFactory.getLog(EchoSpringAutoConfiguration.class); protected EchoSpringAutoConfiguration(EchoSpringProperties clientProperties) { this.clientProperties = clientProperties; @@ -78,7 +78,7 @@ public class EchoSpringAutoConfiguration { * client * *

Individual retry settings are configured as well. It will use the relevant client library's - * default retry settings when they are not specified in EchoProperties. + * default retry settings when they are not specified in EchoSpringProperties. */ @Bean @ConditionalOnMissingBean From ed4b39e0c7246c4111d828f35f99d5c47a3e0725 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 21 Nov 2022 10:50:47 -0500 Subject: [PATCH 079/103] fix(Spring CodeGen): Add Spring dependencies to build files and use static types instead of vapor references (#1046) Adding Spring related dependencies to build files and use static types instead of vapor references. Benefit of this change: - easier to test - less code change needed for future changes (e.g. package change of classes). One caveat is that because `gapic-generator-java` is brought into `googleapis` as `http_archive` code addition to `googleapis` is also needed to include these libraries. Add below code snippet to [WORKSPACE](https://github.com/googleapis/googleapis/blob/38e8b447d173909d3b2fe8fdc3e6cbb3c85442fd/WORKSPACE#L239-L245): ``` SPRING_MAVEN_ARTIFACTS = [ "org.springframework.boot:spring-boot-starter:2.7.4", "com.google.cloud:spring-cloud-gcp-core:3.3.0", ] maven_install( artifacts = PROTOBUF_MAVEN_ARTIFACTS + SPRING_MAVEN_ARTIFACTS, generate_compat_repositories = True, repositories = [ "https://repo.maven.apache.org/maven2/", ], ) ``` ------------ Updates: - Updated pr with #1065, - Moved annotation classed added in #1045 to static types. - Fixed conflicts from merged changes in #1093 - Moved logging classes added in #1053 to static types. --- BUILD.bazel | 16 +- WORKSPACE | 8 +- pom.xml | 12 ++ .../SpringAutoConfigClassComposer.java | 194 ++++++------------ .../spring/composer/SpringComposer.java | 1 + .../SpringPropertiesClassComposer.java | 92 ++++----- .../generator/spring/utils/LoggerUtils.java | 39 ++-- 7 files changed, 148 insertions(+), 214 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index ec0ea39f63..362d83d2a8 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -47,6 +47,16 @@ TEST_DEPS = [ "@io_github_java_diff_utils//jar", ] +SPRING_DEPS = [ + "@maven//:org_springframework_boot_spring_boot_starter", + "@maven//:org_springframework_boot_spring_boot_autoconfigure", + "@maven//:org_springframework_boot_spring_boot", + "@maven//:org_springframework_spring_context", + "@maven//:org_springframework_spring_beans", + "@maven//:com_google_cloud_spring_cloud_gcp_core", + "@maven//:commons_logging_commons_logging", +] + proto_library( name = "service_config_proto", srcs = ["src/main/proto/service_config.proto"], @@ -100,13 +110,13 @@ java_library( name = "gapic_generator_java", srcs = glob(["src/main/java/**/*.java"]), plugins = [":autovalue_plugin"], - deps = MAIN_DEPS, + deps = MAIN_DEPS + SPRING_DEPS, ) java_library( name = "gapic_generator_java_test", srcs = glob(["src/test/java/**/*.java"]), - deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS, + deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS + SPRING_DEPS, ) java_binary( @@ -118,7 +128,7 @@ java_binary( java_binary( name = "protoc-gen-java_gapic_spring", main_class = "com.google.api.generator.spring.Main", - runtime_deps = [":gapic_generator_java"] + MAIN_DEPS, + runtime_deps = [":gapic_generator_java"] + MAIN_DEPS + SPRING_DEPS, ) # Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk diff --git a/WORKSPACE b/WORKSPACE index 32f311e27e..3eedf8aaa9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -79,8 +79,14 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr load("@rules_jvm_external//:defs.bzl", "maven_install") + +SPRING_MAVEN_ARTIFACTS = [ + "org.springframework.boot:spring-boot-starter:2.7.4", + "com.google.cloud:spring-cloud-gcp-core:3.3.0", +] + maven_install( - artifacts = PROTOBUF_MAVEN_ARTIFACTS, + artifacts = PROTOBUF_MAVEN_ARTIFACTS + SPRING_MAVEN_ARTIFACTS, generate_compat_repositories = True, repositories = [ "https://repo.maven.apache.org/maven2/", diff --git a/pom.xml b/pom.xml index a9f45412ad..063770f211 100644 --- a/pom.xml +++ b/pom.xml @@ -324,6 +324,18 @@ 4.13.2 + + + org.springframework.boot + spring-boot-starter + 2.7.4 + + + com.google.cloud + spring-cloud-gcp-core + 3.3.0 + + \n" + " ../../spring-cloud-gcp-starters/pom.xml\n" + " \n" + " %s\n" diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden index ccf200c31d..6d583c2b5a 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -6,7 +6,7 @@ com.google.cloud spring-cloud-gcp-starters - {{parent-version}} + {{parent-version}} ../../spring-cloud-gcp-starters/pom.xml {{client-library-artifact-id}}-spring-starter From 26c2e1257379aa09a82866e5f4b569018812ffb5 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 26 Jan 2023 08:01:26 -0500 Subject: [PATCH 101/103] fix(spring): fix client and settings class names in comments (#1277) * use ClassNames util to generate client and settings class names in comments * update settings bean comment, and remove other usages of service.name() --- .../SpringAutoConfigClassComposer.java | 7 ++- .../SpringAutoconfigCommentComposer.java | 57 +++++++++++-------- .../EchoSpringAutoConfigurationFull.golden | 8 +-- .../EchoSpringAutoConfigurationGrpc.golden | 8 +-- ...EchoSpringAutoConfigurationGrpcRest.golden | 8 +-- 5 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index bcfedd680f..56694f33ac 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -119,7 +119,7 @@ public GapicClass generate(GapicContext context, Service service) { .setName(className) .setScope(ScopeNode.PUBLIC) .setHeaderCommentStatements( - SpringAutoconfigCommentComposer.createClassHeaderComments(className, serviceName)) + SpringAutoconfigCommentComposer.createClassHeaderComments(service)) .setStatements( createMemberVariables(service, packageName, dynamicTypes, gapicServiceConfig)) .setAnnotations(createClassAnnotations(service, dynamicTypes)) @@ -844,7 +844,7 @@ private static MethodDefinition createSettingsBeanMethod( return MethodDefinition.builder() .setHeaderCommentStatements( SpringAutoconfigCommentComposer.createSettingsBeanComment( - service.name(), + service, Utils.getServicePropertiesClassName(service), transportChannelProviderName)) .setName(serviceSettingsMethodName) @@ -945,7 +945,8 @@ private static MethodDefinition createClientBeanMethod( String methodName = JavaStyle.toLowerCamelCase(service.name()) + "Client"; return MethodDefinition.builder() .setHeaderCommentStatements( - SpringAutoconfigCommentComposer.createClientBeanComment(service.name())) + SpringAutoconfigCommentComposer.createClientBeanComment( + service, serviceSettingsMethodName)) .setName(methodName) .setScope(ScopeNode.PUBLIC) .setReturnType(types.get("ServiceClient")) diff --git a/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java index 1c1cc40ac6..68ae474237 100644 --- a/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java @@ -17,14 +17,14 @@ import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.engine.ast.JavaDocComment; import com.google.api.generator.gapic.composer.comment.CommentComposer; -import com.google.common.base.CaseFormat; +import com.google.api.generator.gapic.composer.utils.ClassNames; +import com.google.api.generator.gapic.model.Service; import java.util.Arrays; import java.util.List; public class SpringAutoconfigCommentComposer { - private static final String CLASS_HEADER_SUMMARY_PATTERN = - "Auto-configuration for {@link %sClient}."; + private static final String CLASS_HEADER_SUMMARY_PATTERN = "Auto-configuration for {@link %s}."; private static final String CLASS_HEADER_GENERAL_DESCRIPTION = "Provides auto-configuration for Spring Boot"; private static final String CLASS_HEADER_DEFAULTS_DESCRIPTION = @@ -46,32 +46,31 @@ public class SpringAutoconfigCommentComposer { public static final String TRANSPORT_CHANNEL_PROVIDER_RETURN = "a default transport channel provider."; public static final String CLIENT_SETTINGS_BEAN_GENERAL_DESCRIPTION = - "Provides a %sSettings bean configured to " - + "use the default credentials provider (obtained with %sCredentials()) and its default " - + "transport channel provider (%s()). It also configures the quota project ID if provided. It " - + "will configure an executor provider in case there is more than one thread configured " - + "in the client "; + "Provides a %s bean configured to use a DefaultCredentialsProvider " + + "and the client library's default transport channel provider (%s()). " + + "It also configures the quota project ID and executor thread count, if provided through properties."; public static final String CLIENT_SETTINGS_BEAN_RETRY_SETTINGS_DESCRIPTION = "Retry settings are also configured from service-level and method-level properties specified in %s. " + "Method-level properties will take precedence over service-level properties if available, " + "and client library defaults will be used if neither are specified."; public static final String CLIENT_SETTINGS_BEAN_RETURN_STATEMENT = - "a {@link %sSettings} bean configured with {@link TransportChannelProvider} bean."; + "a {@link %s} bean configured with {@link TransportChannelProvider} bean."; public static final String CLIENT_BEAN_GENERAL_DESCRIPTION = - "Provides a %sClient bean configured with %sSettings."; + "Provides a %s bean configured with %s."; public static final String CLIENT_BEAN_RETURN_STATEMENT = - "a {@link %sClient} bean configured with {@link %sSettings}"; + "a {@link %s} bean configured with {@link %s}"; public SpringAutoconfigCommentComposer() {} - public static List createClassHeaderComments( - String configuredClassName, String serviceName) { + public static List createClassHeaderComments(Service service) { JavaDocComment.Builder javaDocCommentBuilder = JavaDocComment.builder() - .addUnescapedComment(String.format(CLASS_HEADER_SUMMARY_PATTERN, serviceName)) + .addUnescapedComment( + String.format( + CLASS_HEADER_SUMMARY_PATTERN, ClassNames.getServiceClientClassName(service))) .addParagraph(CLASS_HEADER_GENERAL_DESCRIPTION) .addParagraph(CLASS_HEADER_DEFAULTS_DESCRIPTION) .addUnorderedList( @@ -99,34 +98,42 @@ public static CommentStatement createTransportChannelProviderComment() { } public static CommentStatement createSettingsBeanComment( - String serviceName, String propertiesClazzName, String channelProviderName) { - String credentialsBaseName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); + Service service, String propertiesClazzName, String channelProviderName) { return CommentStatement.withComment( JavaDocComment.builder() .addParagraph( String.format( CLIENT_SETTINGS_BEAN_GENERAL_DESCRIPTION, - serviceName, - credentialsBaseName, + ClassNames.getServiceSettingsClassName(service), channelProviderName)) .addParagraph( String.format(CLIENT_SETTINGS_BEAN_RETRY_SETTINGS_DESCRIPTION, propertiesClazzName)) .addParam( "defaultTransportChannelProvider", "TransportChannelProvider to use in the settings.") - .setReturn(String.format(CLIENT_SETTINGS_BEAN_RETURN_STATEMENT, serviceName)) + .setReturn( + String.format( + CLIENT_SETTINGS_BEAN_RETURN_STATEMENT, + ClassNames.getServiceSettingsClassName(service))) .build()); } - public static CommentStatement createClientBeanComment(String serviceName) { - String lowerServiceName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName); + public static CommentStatement createClientBeanComment( + Service service, String serviceSettingsMethodName) { return CommentStatement.withComment( JavaDocComment.builder() - .addParagraph(String.format(CLIENT_BEAN_GENERAL_DESCRIPTION, serviceName, serviceName)) + .addParagraph( + String.format( + CLIENT_BEAN_GENERAL_DESCRIPTION, + ClassNames.getServiceClientClassName(service), + ClassNames.getServiceSettingsClassName(service))) .addParam( - String.format("%sSettings", lowerServiceName), - "settings to configure an instance of client bean.") - .setReturn(String.format(CLIENT_BEAN_RETURN_STATEMENT, serviceName, serviceName)) + serviceSettingsMethodName, "settings to configure an instance of client bean.") + .setReturn( + String.format( + CLIENT_BEAN_RETURN_STATEMENT, + ClassNames.getServiceClientClassName(service), + ClassNames.getServiceSettingsClassName(service))) .build()); } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 2fbb2fd641..5d92cf8bf5 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -97,11 +97,9 @@ public class EchoSpringAutoConfiguration { } /** - * Provides a EchoSettings bean configured to use the default credentials provider (obtained with - * echoCredentials()) and its default transport channel provider - * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. - * It will configure an executor provider in case there is more than one thread configured in the - * client + * Provides a EchoSettings bean configured to use a DefaultCredentialsProvider and the client + * library's default transport channel provider (defaultEchoTransportChannelProvider()). It also + * configures the quota project ID and executor thread count, if provided through properties. * *

Retry settings are also configured from service-level and method-level properties specified * in EchoSpringProperties. Method-level properties will take precedence over service-level diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden index 5970020cab..69b78807db 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -77,11 +77,9 @@ public class EchoSpringAutoConfiguration { } /** - * Provides a EchoSettings bean configured to use the default credentials provider (obtained with - * echoCredentials()) and its default transport channel provider - * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. - * It will configure an executor provider in case there is more than one thread configured in the - * client + * Provides a EchoSettings bean configured to use a DefaultCredentialsProvider and the client + * library's default transport channel provider (defaultEchoTransportChannelProvider()). It also + * configures the quota project ID and executor thread count, if provided through properties. * *

Retry settings are also configured from service-level and method-level properties specified * in EchoSpringProperties. Method-level properties will take precedence over service-level diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden index 6d424dfa43..a47bc5fa01 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden @@ -81,11 +81,9 @@ public class EchoSpringAutoConfiguration { } /** - * Provides a EchoSettings bean configured to use the default credentials provider (obtained with - * echoCredentials()) and its default transport channel provider - * (defaultEchoTransportChannelProvider()). It also configures the quota project ID if provided. - * It will configure an executor provider in case there is more than one thread configured in the - * client + * Provides a EchoSettings bean configured to use a DefaultCredentialsProvider and the client + * library's default transport channel provider (defaultEchoTransportChannelProvider()). It also + * configures the quota project ID and executor thread count, if provided through properties. * *

Retry settings are also configured from service-level and method-level properties specified * in EchoSpringProperties. Method-level properties will take precedence over service-level From 3f5db4df197aa9dda211519c98acbaa5e65a0244 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 9 Feb 2023 14:36:01 -0500 Subject: [PATCH 102/103] fix(spring): update hasRestOption to exclude services with no rest-supported methods (#1343) --- .../composer/SpringAutoConfigClassComposer.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java index 56694f33ac..1c83dd02d5 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java @@ -110,7 +110,17 @@ public GapicClass generate(GapicContext context, Service service) { Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(dynamicTypes.get(className))); Transport transport = context.transport(); - boolean hasRestOption = transport.equals(Transport.GRPC_REST); + // TODO(emmwang): this condition is adapted from latest gapic-generator-java changes as part of + // https://github.com/googleapis/gapic-generator-java/issues/1117, but should be updated to use + // the gapic-implemented helpers once spring generator code is migrated. + boolean hasRestSupportedMethod = + service.methods().stream() + .anyMatch( + x -> + x.httpBindings() != null + && x.stream() != Method.Stream.BIDI + && x.stream() != Method.Stream.CLIENT); + boolean hasRestOption = transport.equals(Transport.GRPC_REST) && hasRestSupportedMethod; String serviceSettingsMethodName = JavaStyle.toLowerCamelCase(service.name()) + "Settings"; ClassDefinition classDef = From dcd082333eca7938e627855b294db995da06ee11 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 16 Feb 2023 14:20:30 +0000 Subject: [PATCH 103/103] fix(spring): extend hasRestOption fix to properties composer and add golden tests (#1348) This PR is a follow-up on #1343: - Extends fix to SpringPropertiesClassComposer, so that for services without REST-enabled rpcs, the unused useRest property is also not generated - Adds golden tests for the updated hasRestOption scenario using the wicked proto - Updates SpringAutoconfigCommentComposer for javadoc comments alluding to the useRest option --- .../SpringPropertiesClassComposer.java | 13 +- .../SpringAutoconfigCommentComposer.java | 2 +- .../grpcrest/GrpcRestTestProtoLoader.java | 32 ++++ .../SpringAutoConfigClassComposerTest.java | 16 +- .../SpringPropertiesClassComposerTest.java | 15 ++ .../EchoSpringAutoConfigurationFull.golden | 2 +- .../EchoSpringAutoConfigurationGrpc.golden | 2 +- ...EchoSpringAutoConfigurationGrpcRest.golden | 2 +- ...edSpringAutoConfigurationNoRestRpcs.golden | 164 ++++++++++++++++++ .../WickedSpringPropertiesNoRestRpcs.golden | 63 +++++++ src/test/proto/wicked.proto | 49 ++++++ 11 files changed, 354 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden create mode 100644 src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringPropertiesNoRestRpcs.golden create mode 100644 src/test/proto/wicked.proto diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java index 6699582063..34d67eb92e 100644 --- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java @@ -75,7 +75,18 @@ public GapicClass generate(GapicContext context, Service service) { String className = Utils.getServicePropertiesClassName(service); GapicServiceConfig gapicServiceConfig = context.serviceConfig(); Map dynamicTypes = createDynamicTypes(service, packageName); - boolean hasRestOption = context.transport().equals(Transport.GRPC_REST); + // TODO(emmwang): this condition is adapted from latest gapic-generator-java changes as part of + // https://github.com/googleapis/gapic-generator-java/issues/1117, but should be updated to use + // the gapic-implemented helpers once spring generator code is migrated. + boolean hasRestSupportedMethod = + service.methods().stream() + .anyMatch( + x -> + x.httpBindings() != null + && x.stream() != Method.Stream.BIDI + && x.stream() != Method.Stream.CLIENT); + boolean hasRestOption = + context.transport().equals(Transport.GRPC_REST) && hasRestSupportedMethod; // TODO: this is the prefix user will use to set properties, may need to change depending on // branding. diff --git a/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java index 68ae474237..52be895586 100644 --- a/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java +++ b/src/main/java/com/google/api/generator/spring/composer/comment/SpringAutoconfigCommentComposer.java @@ -42,7 +42,7 @@ public class SpringAutoconfigCommentComposer { public static final String TRANSPORT_CHANNEL_PROVIDER_GENERAL_DESCRIPTION = "Provides a default transport channel provider bean. The default is gRPC and will default to it unless the " - + "useRest option is provided to use HTTP transport instead"; + + "useRest option is supported and provided to use HTTP transport instead"; public static final String TRANSPORT_CHANNEL_PROVIDER_RETURN = "a default transport channel provider."; public static final String CLIENT_SETTINGS_BEAN_GENERAL_DESCRIPTION = diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java index 05c0241327..1e3b057170 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestTestProtoLoader.java @@ -31,6 +31,7 @@ import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.protobuf.StructProto; import com.google.showcase.grpcrest.v1beta1.EchoGrpcrest; +import com.google.showcase.v1beta1.WickedOuterClass; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashSet; @@ -82,4 +83,35 @@ public GapicContext parseShowcaseEcho() { .setTransport(getTransport()) .build(); } + + public GapicContext parseShowcaseWicked() { + FileDescriptor fileDescriptor = WickedOuterClass.getDescriptor(); + ServiceDescriptor messagingService = fileDescriptor.getServices().get(0); + assertEquals("Wicked", messagingService.getName()); + + Map messageTypes = Parser.parseMessages(fileDescriptor); + messageTypes.putAll(Parser.parseMessages(OperationsProto.getDescriptor())); + messageTypes.putAll(Parser.parseMessages(StructProto.getDescriptor())); + + Map resourceNames = Parser.parseResourceNames(fileDescriptor); + Set outputResourceNames = new HashSet<>(); + List services = + Parser.parseService( + fileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); + + String jsonFilename = "showcase_grpc_service_config.json"; + Path jsonPath = Paths.get(getTestFilesDirectory(), jsonFilename); + Optional configOpt = ServiceConfigParser.parse(jsonPath.toString()); + assertTrue(configOpt.isPresent()); + GapicServiceConfig config = configOpt.get(); + + return GapicContext.builder() + .setMessages(messageTypes) + .setResourceNames(resourceNames) + .setServices(services) + .setServiceConfig(config) + .setHelperResourceNames(outputResourceNames) + .setTransport(getTransport()) + .build(); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java index 7ee9904fe1..fed4cb96c5 100644 --- a/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposerTest.java @@ -15,6 +15,7 @@ package com.google.api.generator.spring.composer; import com.google.api.generator.gapic.composer.common.TestProtoLoader; +import com.google.api.generator.gapic.composer.grpcrest.GrpcRestTestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; @@ -25,12 +26,16 @@ public class SpringAutoConfigClassComposerTest { private GapicContext context; + private GapicContext wickedContext; private Service echoProtoService; + private Service wickedProtoService; @Before public void setUp() { this.context = TestProtoLoader.instance().parseShowcaseEcho(); this.echoProtoService = this.context.services().get(0); + this.wickedContext = GrpcRestTestProtoLoader.instance().parseShowcaseWicked(); + this.wickedProtoService = this.wickedContext.services().get(0); } @Test @@ -43,7 +48,6 @@ public void generateAutoConfigClazzGrpcTest() { @Test public void generateAutoConfigClazzGrpcRestTest() { - GapicContext contextGrpcRest = this.context.toBuilder().setTransport(Transport.GRPC_REST).build(); GapicClass clazz = @@ -51,4 +55,14 @@ public void generateAutoConfigClazzGrpcRestTest() { String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden"; Assert.assertGoldenClass(this.getClass(), clazz, fileName); } + + @Test + public void generateAutoConfigClazzNoRestRpcsTest() { + GapicContext contextGrpcRest = + this.wickedContext.toBuilder().setTransport(Transport.GRPC_REST).build(); + GapicClass clazz = + SpringAutoConfigClassComposer.instance().generate(contextGrpcRest, this.wickedProtoService); + String fileName = clazz.classDefinition().classIdentifier() + "NoRestRpcs.golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java index 356f976e0b..ff349804d5 100644 --- a/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java +++ b/src/test/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposerTest.java @@ -15,6 +15,7 @@ package com.google.api.generator.spring.composer; import com.google.api.generator.gapic.composer.common.TestProtoLoader; +import com.google.api.generator.gapic.composer.grpcrest.GrpcRestTestProtoLoader; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; @@ -25,12 +26,16 @@ public class SpringPropertiesClassComposerTest { private GapicContext context; + private GapicContext wickedContext; private Service echoProtoService; + private Service wickedProtoService; @Before public void setUp() { this.context = TestProtoLoader.instance().parseShowcaseEcho(); this.echoProtoService = this.context.services().get(0); + this.wickedContext = GrpcRestTestProtoLoader.instance().parseShowcaseWicked(); + this.wickedProtoService = this.wickedContext.services().get(0); } @Test @@ -50,4 +55,14 @@ public void generatePropertiesClazzGrpcRestTest() { String fileName = clazz.classDefinition().classIdentifier() + "GrpcRest.golden"; Assert.assertGoldenClass(this.getClass(), clazz, fileName); } + + @Test + public void generatePropertiesClazzNoRestRpcsTest() { + GapicContext contextGrpcRest = + this.wickedContext.toBuilder().setTransport(Transport.GRPC_REST).build(); + GapicClass clazz = + SpringPropertiesClassComposer.instance().generate(contextGrpcRest, this.wickedProtoService); + String fileName = clazz.classDefinition().classIdentifier() + "NoRestRpcs.golden"; + Assert.assertGoldenClass(this.getClass(), clazz, fileName); + } } diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden index 5d92cf8bf5..ca203c82fe 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden @@ -86,7 +86,7 @@ public class EchoSpringAutoConfiguration { /** * Provides a default transport channel provider bean. The default is gRPC and will default to it - * unless the useRest option is provided to use HTTP transport instead + * unless the useRest option is supported and provided to use HTTP transport instead * * @return a default transport channel provider. */ diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden index 69b78807db..c3b708b68b 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden @@ -66,7 +66,7 @@ public class EchoSpringAutoConfiguration { /** * Provides a default transport channel provider bean. The default is gRPC and will default to it - * unless the useRest option is provided to use HTTP transport instead + * unless the useRest option is supported and provided to use HTTP transport instead * * @return a default transport channel provider. */ diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden index a47bc5fa01..50fd2c2bef 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden @@ -67,7 +67,7 @@ public class EchoSpringAutoConfiguration { /** * Provides a default transport channel provider bean. The default is gRPC and will default to it - * unless the useRest option is provided to use HTTP transport instead + * unless the useRest option is supported and provided to use HTTP transport instead * * @return a default transport channel provider. */ diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden new file mode 100644 index 0000000000..9ee75624d0 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden @@ -0,0 +1,164 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.api.gax.core.CredentialsProvider; +import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration; +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.DefaultCredentialsProvider; +import com.google.cloud.spring.core.Retry; +import com.google.cloud.spring.core.util.RetryUtil; +import com.google.showcase.v1beta1.WickedClient; +import com.google.showcase.v1beta1.WickedSettings; +import java.io.IOException; +import java.util.Collections; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Auto-configuration for {@link WickedClient}. + * + *

Provides auto-configuration for Spring Boot + * + *

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

    + *
  • The default transport provider is used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ */ +@AutoConfiguration +@AutoConfigureAfter(GcpContextAutoConfiguration.class) +@ConditionalOnClass(WickedClient.class) +@ConditionalOnProperty(value = "com.google.showcase.v1beta1.wicked.enabled", matchIfMissing = true) +@EnableConfigurationProperties(WickedSpringProperties.class) +public class WickedSpringAutoConfiguration { + private final WickedSpringProperties clientProperties; + private final CredentialsProvider credentialsProvider; + private static final Log LOGGER = LogFactory.getLog(WickedSpringAutoConfiguration.class); + + protected WickedSpringAutoConfiguration( + WickedSpringProperties clientProperties, CredentialsProvider credentialsProvider) + throws IOException { + this.clientProperties = clientProperties; + if (this.clientProperties.getCredentials().hasKey()) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Using credentials from Wicked-specific configuration"); + } + this.credentialsProvider = + ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); + } else { + this.credentialsProvider = credentialsProvider; + } + } + + /** + * Provides a default transport channel provider bean. The default is gRPC and will default to it + * unless the useRest option is supported and provided to use HTTP transport instead + * + * @return a default transport channel provider. + */ + @Bean + @ConditionalOnMissingBean(name = "defaultWickedTransportChannelProvider") + public TransportChannelProvider defaultWickedTransportChannelProvider() { + return WickedSettings.defaultTransportChannelProvider(); + } + + /** + * Provides a WickedSettings bean configured to use a DefaultCredentialsProvider and the client + * library's default transport channel provider (defaultWickedTransportChannelProvider()). It also + * configures the quota project ID and executor thread count, if provided through properties. + * + *

Retry settings are also configured from service-level and method-level properties specified + * in WickedSpringProperties. Method-level properties will take precedence over service-level + * properties if available, and client library defaults will be used if neither are specified. + * + * @param defaultTransportChannelProvider TransportChannelProvider to use in the settings. + * @return a {@link WickedSettings} bean configured with {@link TransportChannelProvider} bean. + */ + @Bean + @ConditionalOnMissingBean + public WickedSettings wickedSettings( + @Qualifier("defaultWickedTransportChannelProvider") + TransportChannelProvider defaultTransportChannelProvider) + throws IOException { + WickedSettings.Builder clientSettingsBuilder = WickedSettings.newBuilder(); + clientSettingsBuilder + .setCredentialsProvider(this.credentialsProvider) + .setTransportChannelProvider(defaultTransportChannelProvider) + .setHeaderProvider(this.userAgentHeaderProvider()); + if (this.clientProperties.getQuotaProjectId() != null) { + clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Quota project id set to " + + this.clientProperties.getQuotaProjectId() + + ", this overrides project id from credentials."); + } + } + if (this.clientProperties.getExecutorThreadCount() != null) { + ExecutorProvider executorProvider = + WickedSettings.defaultExecutorProviderBuilder() + .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) + .build(); + clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Background executor thread count is " + + this.clientProperties.getExecutorThreadCount()); + } + } + Retry serviceRetry = clientProperties.getRetry(); + if (serviceRetry != null) { + RetrySettings craftEvilPlanRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.craftEvilPlanSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.craftEvilPlanSettings().setRetrySettings(craftEvilPlanRetrySettings); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured service-level retry settings from properties."); + } + } + Retry craftEvilPlanRetry = clientProperties.getCraftEvilPlanRetry(); + if (craftEvilPlanRetry != null) { + RetrySettings craftEvilPlanRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.craftEvilPlanSettings().getRetrySettings(), craftEvilPlanRetry); + clientSettingsBuilder.craftEvilPlanSettings().setRetrySettings(craftEvilPlanRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for craftEvilPlan from properties."); + } + } + return clientSettingsBuilder.build(); + } + + /** + * Provides a WickedClient bean configured with WickedSettings. + * + * @param wickedSettings settings to configure an instance of client bean. + * @return a {@link WickedClient} bean configured with {@link WickedSettings} + */ + @Bean + @ConditionalOnMissingBean + public WickedClient wickedClient(WickedSettings wickedSettings) throws IOException { + return WickedClient.create(wickedSettings); + } + + private HeaderProvider userAgentHeaderProvider() { + String springLibrary = "spring-autogen-wicked"; + String version = this.getClass().getPackage().getImplementationVersion(); + return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + } +} diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringPropertiesNoRestRpcs.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringPropertiesNoRestRpcs.golden new file mode 100644 index 0000000000..1efaf25408 --- /dev/null +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/WickedSpringPropertiesNoRestRpcs.golden @@ -0,0 +1,63 @@ +package com.google.showcase.v1beta1.spring; + +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.CredentialsSupplier; +import com.google.cloud.spring.core.Retry; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** Provides default property values for Wicked client bean */ +@ConfigurationProperties("com.google.showcase.v1beta1.wicked") +public class WickedSpringProperties implements CredentialsSupplier { + /** OAuth2 credentials to authenticate and authorize calls to Google Cloud Client Libraries. */ + @NestedConfigurationProperty private final Credentials credentials = new Credentials(); + /** Quota project to use for billing. */ + private String quotaProjectId; + /** Number of threads used for executors. */ + private Integer executorThreadCount; + /** Allow override of retry settings at service level, applying to all of its RPC methods. */ + @NestedConfigurationProperty private Retry retry; + /** + * Allow override of retry settings at method-level for craftEvilPlan. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry craftEvilPlanRetry; + + @Override + public Credentials getCredentials() { + return this.credentials; + } + + public String getQuotaProjectId() { + return this.quotaProjectId; + } + + public void setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; + } + + public Integer getExecutorThreadCount() { + return this.executorThreadCount; + } + + public void setExecutorThreadCount(Integer executorThreadCount) { + this.executorThreadCount = executorThreadCount; + } + + public Retry getRetry() { + return this.retry; + } + + public void setRetry(Retry retry) { + this.retry = retry; + } + + public Retry getCraftEvilPlanRetry() { + return this.craftEvilPlanRetry; + } + + public void setCraftEvilPlanRetry(Retry craftEvilPlanRetry) { + this.craftEvilPlanRetry = craftEvilPlanRetry; + } +} diff --git a/src/test/proto/wicked.proto b/src/test/proto/wicked.proto new file mode 100644 index 0000000000..ea45fee918 --- /dev/null +++ b/src/test/proto/wicked.proto @@ -0,0 +1,49 @@ +// Copyright 2023 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 +// +// https://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. + +syntax = "proto3"; + +import "google/api/client.proto"; + +package google.showcase.v1beta1; + +option go_package = "github.com/googleapis/gapic-showcase/server/genproto"; +option java_package = "com.google.showcase.v1beta1"; +option java_multiple_files = true; +option ruby_package = "Google::Showcase::V1beta1"; + +// This service is used to show a Service with either non-enabled or non-eligible +// RPCs for HttpJson (Http 1.1). +// Non-Enabled: Missing the (google.api.http) annotation to enabled it +// Non-Eligible: BIDI and Client side streaming are not supported with Http 1.1 +// Service name is reference to `No REST for the Wicked` +service Wicked { + // This service is meant to only run locally on the port 7469 (keypad digits + // for "show"). + option (google.api.default_host) = "localhost:7469"; + + rpc CraftEvilPlan(EvilRequest) returns (EvilResponse); + + rpc BrainstormEvilPlans(stream EvilRequest) returns (stream EvilResponse); + + rpc PersuadeEvilPlan(stream EvilRequest) returns (EvilResponse); +} + +message EvilRequest { + string malicious_idea = 1; +} + +message EvilResponse { + string malicious_plan = 1; +} \ No newline at end of file