From 238ad0a5f3bcefdace08998b82042865cda65b9f Mon Sep 17 00:00:00 2001 From: Alice Li Date: Thu, 15 Sep 2022 14:08:06 -0400 Subject: [PATCH 01/21] fix: update sample region tag to parse host instead of proto package --- .../generator/gapic/composer/Composer.java | 51 +++++--- ...ctServiceCallableFactoryClassComposer.java | 2 +- .../AbstractServiceClientClassComposer.java | 3 +- ...bstractServiceClientTestClassComposer.java | 2 +- .../AbstractServiceSettingsClassComposer.java | 3 +- .../AbstractServiceStubClassComposer.java | 2 +- ...tractServiceStubSettingsClassComposer.java | 5 +- ...ractTransportServiceStubClassComposer.java | 2 +- .../grpc/MockServiceClassComposer.java | 2 +- .../grpc/MockServiceImplClassComposer.java | 2 +- .../ResourceNameHelperClassComposer.java | 3 +- .../samplecode/SettingsSampleComposer.java | 1 + .../api/generator/gapic/model/GapicClass.java | 30 ++++- .../api/generator/gapic/model/RegionTag.java | 1 + .../gapic/composer/ComposerTest.java | 110 ++++++++++++------ ...rviceCallableFactoryClassComposerTest.java | 2 + .../GrpcServiceStubClassComposerTest.java | 6 + .../grpc/MockServiceClassComposerTest.java | 1 + .../MockServiceImplClassComposerTest.java | 12 +- .../grpc/ServiceClientClassComposerTest.java | 33 ++++-- .../ServiceClientTestClassComposerTest.java | 35 +++++- .../ServiceSettingsClassComposerTest.java | 12 +- .../grpc/ServiceStubClassComposerTest.java | 12 +- .../ServiceStubSettingsClassComposerTest.java | 26 ++++- .../ResourceNameHelperClassComposerTest.java | 6 + 25 files changed, 281 insertions(+), 83 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..2bc38a3c51 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; @@ -29,16 +30,12 @@ import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer; import com.google.api.generator.gapic.composer.rest.HttpJsonServiceCallableFactoryClassComposer; import com.google.api.generator.gapic.composer.rest.HttpJsonServiceStubClassComposer; -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.Sample; -import com.google.api.generator.gapic.model.Service; -import com.google.api.generator.gapic.model.Transport; +import com.google.api.generator.gapic.model.*; import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.regex.Pattern; import java.util.stream.Collectors; public class Composer { @@ -191,17 +188,14 @@ 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() @@ -210,17 +204,48 @@ static List prepareExecutableSamples(List clazzes, Strin List samples = gapicClass.samples().stream() .map( - sample -> addRegionTagAndHeaderToSample(sample, apiShortName, apiVersion)) + sample -> + addRegionTagAndHeaderToSample( + sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion)) .collect(Collectors.toList()); return gapicClass.withSamples(samples); }) .collect(Collectors.toList()); } - private static Sample addRegionTagAndHeaderToSample( + // Parse defaultHost for apiShortName. Need to account for regional default endpoints like + // "us-east1-pubsub.googleapis.com". + // Will keep backup name parsed from proto package for now. + @VisibleForTesting + protected static String parseDefaultHost(String defaultHost) { + String apiShortName; + String apiShortNameHelper; + // If the defaultHost is of the format "**.googleapis.com", take the name before the first + // period. + Pattern standardApiHost = Pattern.compile("\\."); + // 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 + Pattern regionalApiHost = Pattern.compile("-"); + apiShortNameHelper = standardApiHost.split(defaultHost)[0]; + apiShortName = defaultHost; + if (standardApiHost.split(defaultHost).length > 1 + && regionalApiHost.split(defaultHost).length > 1) { + apiShortName = + regionalApiHost + .split(apiShortNameHelper)[regionalApiHost.split(apiShortNameHelper).length - 1]; + } else { + apiShortName = apiShortNameHelper; + } + 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/AbstractServiceCallableFactoryClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java index 9fcbaa0f9e..06922f63dd 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java @@ -83,7 +83,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, typeStore)) .setScope(ScopeNode.PUBLIC) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } protected List createClassAnnotations(Service service, TypeStore typeStore) { 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..a56cc55e2f 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), service.defaultHost()); } private static List createClassAnnotations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java index 896607982c..1800193e37 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java @@ -127,7 +127,7 @@ protected GapicClass generate(String className, GapicContext context, Service se .setMethods( createClassMethods(service, context, classMemberVarExprs, typeStore, resourceNames)) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } protected boolean isSupportedMethod(Method method) { 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..7c0bcbf148 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), service.defaultHost()); } private static List createClassHeaderComments( diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java index c9835c69e4..d2456feb8e 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java @@ -87,7 +87,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, messageTypes, typeStore)) .setScope(ScopeNode.PUBLIC) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } private static List createClassAnnotations(Service service, TypeStore typeStore) { 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..be920d8a77 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,10 @@ 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), + service.defaultHost()); } protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java index c2f4fb7473..f648378c53 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java @@ -215,7 +215,7 @@ public GapicClass generate(GapicContext context, Service service) { classStatements)) .setStatements(classStatements) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } protected boolean isSupportedMethod(Method method) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java index 7227b4fe4a..5329d4c1be 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java @@ -69,7 +69,7 @@ public GapicClass generate(GapicContext ignored, Service service) { .setStatements(createFieldDeclarations(service, typeStore)) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } private static List createFieldDeclarations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java index e16cc875f4..ddfe6ade7e 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java @@ -126,7 +126,7 @@ public GapicClass generate(GapicContext context, Service service) { .setStatements(createFieldDeclarations()) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef); + return GapicClass.create(kind, classDef, service.defaultHost()); } private static List createFieldDeclarations() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index f8c961ccab..5b29219aff 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -149,7 +149,8 @@ public GapicClass generate(ResourceName resourceName, GapicContext context) { createNestedBuilderClasses( resourceName, tokenHierarchies, templateFinalVarExprs, typeStore)) .build(); - return GapicClass.create(GapicClass.Kind.PROTO, classDef); + return GapicClass.create( + GapicClass.Kind.PROTO, classDef, context.services().get(0).defaultHost()); } private static List createClassAnnotations() { 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..4ec61770b8 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,8 @@ public enum Kind { public abstract List samples(); + public abstract String defaultHost(); + public static GapicClass create(Kind kind, ClassDefinition classDefinition) { return builder().setKind(kind).setClassDefinition(classDefinition).build(); } @@ -44,8 +46,28 @@ public static GapicClass create( return builder().setKind(kind).setClassDefinition(classDefinition).setSamples(samples).build(); } + public static GapicClass create(Kind kind, ClassDefinition classDefinition, String defaultHost) { + return builder() + .setKind(kind) + .setClassDefinition(classDefinition) + .setDefaultHost(defaultHost) + .build(); + } + + public static GapicClass create( + Kind kind, ClassDefinition classDefinition, List samples, String defaultHost) { + return builder() + .setKind(kind) + .setClassDefinition(classDefinition) + .setSamples(samples) + .setDefaultHost(defaultHost) + .build(); + } + 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 +76,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 +88,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..91409151ed 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 @@ -14,22 +14,17 @@ package com.google.api.generator.gapic.composer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; -import com.google.api.generator.engine.ast.ClassDefinition; -import com.google.api.generator.engine.ast.ScopeNode; +import com.google.api.generator.engine.ast.*; import com.google.api.generator.engine.writer.JavaWriterVisitor; 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.GrpcTestProtoLoader; -import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.*; import com.google.api.generator.gapic.model.GapicClass.Kind; -import com.google.api.generator.gapic.model.GapicContext; -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 +37,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 +65,94 @@ 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(); + // Assert.assertCodeEquals(composedSamples.toString(), "egg"); + assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { assertEquals( - "File header should be apache", - sample.fileHeader(), - Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT)); + "File header should be APACHE", + Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), + sample.fileHeader()); assertEquals( - "ApiShortName should be showcase", sample.regionTag().apiShortName(), "showcase"); - assertEquals("ApiVersion should be v1beta1", sample.regionTag().apiVersion(), "v1beta1"); + "ApiShortName should be Localhost7469", + "Localhost7469", + sample.regionTag().apiShortName()); + assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion()); } } + @Test + public void parseDefaultHostTest() { + String defaultHost = "us-east1-pubsub.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + org.junit.Assert.assertEquals("pubsub", apiShortName); + + defaultHost = "logging.googleapis.com"; + apiShortName = Composer.parseDefaultHost(defaultHost); + org.junit.Assert.assertEquals("logging", apiShortName); + + defaultHost = "localhost:7469"; + apiShortName = Composer.parseDefaultHost(defaultHost); + org.junit.Assert.assertEquals("localhost:7469", apiShortName); + } + + @Test + public void gapicClass_addRegionTagAndHeaderToSample() { + Sample testSample; + testSample = Composer.addRegionTagAndHeaderToSample(sample, "showcase", "v1"); + org.junit.Assert.assertEquals("Showcase", testSample.regionTag().apiShortName()); + org.junit.Assert.assertEquals("V1", testSample.regionTag().apiVersion()); + org.junit.Assert.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/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java index 7269d61140..dfe7e9a66a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java @@ -30,6 +30,7 @@ public void generateServiceClasses() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -41,5 +42,6 @@ public void generateServiceClasses_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java index f41143acbe..a708288aa9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java @@ -29,6 +29,7 @@ public void generateGrpcServiceStubClass_simple() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -39,6 +40,7 @@ public void generateGrpcServiceStubClass_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -49,6 +51,7 @@ public void generateGrpcServiceStubClass_httpBindings() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcTestingStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -60,6 +63,7 @@ public void generateGrpcServiceStubClass_routingHeaders() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcRoutingHeadersStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -70,6 +74,7 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcPublisherStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "pubsub.googleapis.com:443"); } @Test @@ -80,5 +85,6 @@ public void generateGrpcServiceStubClass_createBatchingCallable() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcLoggingStub.golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "logging.googleapis.com:443"); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java index 7762c6a4df..38d8309590 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java @@ -47,5 +47,6 @@ public void generateMockServiceClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java index aa062279ec..40f332e666 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java @@ -30,8 +30,12 @@ public class MockServiceImplClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"MockEchoImpl", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, - {"MockDeprecatedServiceImpl", GrpcTestProtoLoader.instance().parseDeprecatedService()} + {"MockEchoImpl", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "MockDeprecatedServiceImpl", + GrpcTestProtoLoader.instance().parseDeprecatedService(), + "localhost:7469" + } }); } @@ -40,6 +44,9 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; + @Parameterized.Parameter(2) + public String defaultHostExpected; + @Test public void generateMockServiceImplClasses() { Service service = context.services().get(0); @@ -47,5 +54,6 @@ public void generateMockServiceImplClasses() { 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/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/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java index 0eca4e060d..6e67fe2d35 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java @@ -30,15 +30,36 @@ public class ServiceClientTestClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoClientTest", GrpcTestProtoLoader.instance().parseShowcaseEcho(), 0}, + { + "EchoClientTest", + GrpcTestProtoLoader.instance().parseShowcaseEcho(), + 0, + "localhost:7469" + }, { "DeprecatedServiceClientTest", GrpcTestProtoLoader.instance().parseDeprecatedService(), - 0 + 0, + "localhost:7469" + }, + { + "TestingClientTest", + GrpcTestProtoLoader.instance().parseShowcaseTesting(), + 0, + "localhost:7469" + }, + { + "SubscriberClientTest", + GrpcTestProtoLoader.instance().parsePubSubPublisher(), + 1, + "pubsub.googleapis.com:443" + }, + { + "LoggingClientTest", + GrpcTestProtoLoader.instance().parseLogging(), + 0, + "logging.googleapis.com:443" }, - {"TestingClientTest", GrpcTestProtoLoader.instance().parseShowcaseTesting(), 0}, - {"SubscriberClientTest", GrpcTestProtoLoader.instance().parsePubSubPublisher(), 1}, - {"LoggingClientTest", GrpcTestProtoLoader.instance().parseLogging(), 0}, }); } @@ -50,6 +71,9 @@ public static Collection data() { @Parameterized.Parameter(2) public int serviceIndex; + @Parameterized.Parameter(3) + public String defaultHostExpected; + @Test public void generateServiceClientTestClasses() { Service echoProtoService = context.services().get(serviceIndex); @@ -58,5 +82,6 @@ public void generateServiceClientTestClasses() { 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/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..1d144d2714 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,12 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho()}, - {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService()} + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "DeprecatedServiceStub", + 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 generateServiceStubClasses() { Service service = context.services().get(0); @@ -48,5 +55,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/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java index c54218a52e..98ec63ab51 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java @@ -110,6 +110,7 @@ public void generateResourceNameClass_echoFoobarMultiplePatterns() { Utils.saveCodegenToFile(this.getClass(), "FoobarName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "FoobarName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -154,7 +155,9 @@ public void generateResourceNameClass_loggingOnePatternMultipleVariables() { Utils.saveCodegenToFile(this.getClass(), "BillingAccountLocationName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "BillingAccountLocationName.golden"); + // TODO: line 159 fails - https://github.com/googleapis/gapic-generator-java/issues/805 Assert.assertCodeEquals(goldenFilePath, visitor.write()); + Assert.assertCodeEquals(clazz.defaultHost(), "logging.googleapis.com:443"); } @Test @@ -181,6 +184,7 @@ public void generateResourceNameClass_testingSessionOnePattern() { Utils.saveCodegenToFile(this.getClass(), "SessionName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "SessionName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -207,6 +211,7 @@ public void generateResourceNameClass_testingBlueprintPatternWithNonSlashSeparat Utils.saveCodegenToFile(this.getClass(), "TestName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "TestName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -231,5 +236,6 @@ public void generateResourceNameClass_childSingleton() { Utils.saveCodegenToFile(this.getClass(), "AgentName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "AgentName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); + Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } } From d58b78d398ccf13761ffb9655f126cc9ef63a977 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Thu, 15 Sep 2022 15:29:08 -0400 Subject: [PATCH 02/21] update goldens --- .../analyzeiampolicy/AsyncAnalyzeIamPolicy.java | 4 ++-- .../analyzeiampolicy/SyncAnalyzeIamPolicy.java | 4 ++-- .../AsyncAnalyzeIamPolicyLongrunning.java | 4 ++-- .../AsyncAnalyzeIamPolicyLongrunningLRO.java | 4 ++-- .../SyncAnalyzeIamPolicyLongrunning.java | 4 ++-- .../v1/assetserviceclient/analyzemove/AsyncAnalyzeMove.java | 4 ++-- .../v1/assetserviceclient/analyzemove/SyncAnalyzeMove.java | 4 ++-- .../batchgetassetshistory/AsyncBatchGetAssetsHistory.java | 4 ++-- .../batchgetassetshistory/SyncBatchGetAssetsHistory.java | 4 ++-- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../v1/assetserviceclient/create/SyncCreateSetEndpoint.java | 4 ++-- .../v1/assetserviceclient/createfeed/AsyncCreateFeed.java | 4 ++-- .../v1/assetserviceclient/createfeed/SyncCreateFeed.java | 4 ++-- .../assetserviceclient/createfeed/SyncCreateFeedString.java | 4 ++-- .../v1/assetserviceclient/deletefeed/AsyncDeleteFeed.java | 4 ++-- .../v1/assetserviceclient/deletefeed/SyncDeleteFeed.java | 4 ++-- .../assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java | 4 ++-- .../assetserviceclient/deletefeed/SyncDeleteFeedString.java | 4 ++-- .../v1/assetserviceclient/exportassets/AsyncExportAssets.java | 4 ++-- .../assetserviceclient/exportassets/AsyncExportAssetsLRO.java | 4 ++-- .../v1/assetserviceclient/exportassets/SyncExportAssets.java | 4 ++-- .../asset/v1/assetserviceclient/getfeed/AsyncGetFeed.java | 4 ++-- .../asset/v1/assetserviceclient/getfeed/SyncGetFeed.java | 4 ++-- .../v1/assetserviceclient/getfeed/SyncGetFeedFeedname.java | 4 ++-- .../v1/assetserviceclient/getfeed/SyncGetFeedString.java | 4 ++-- .../v1/assetserviceclient/listassets/AsyncListAssets.java | 4 ++-- .../assetserviceclient/listassets/AsyncListAssetsPaged.java | 4 ++-- .../v1/assetserviceclient/listassets/SyncListAssets.java | 4 ++-- .../listassets/SyncListAssetsResourcename.java | 4 ++-- .../assetserviceclient/listassets/SyncListAssetsString.java | 4 ++-- .../asset/v1/assetserviceclient/listfeeds/AsyncListFeeds.java | 4 ++-- .../asset/v1/assetserviceclient/listfeeds/SyncListFeeds.java | 4 ++-- .../v1/assetserviceclient/listfeeds/SyncListFeedsString.java | 4 ++-- .../searchalliampolicies/AsyncSearchAllIamPolicies.java | 4 ++-- .../searchalliampolicies/AsyncSearchAllIamPoliciesPaged.java | 4 ++-- .../searchalliampolicies/SyncSearchAllIamPolicies.java | 4 ++-- .../SyncSearchAllIamPoliciesStringString.java | 4 ++-- .../searchallresources/AsyncSearchAllResources.java | 4 ++-- .../searchallresources/AsyncSearchAllResourcesPaged.java | 4 ++-- .../searchallresources/SyncSearchAllResources.java | 4 ++-- .../SyncSearchAllResourcesStringStringListstring.java | 4 ++-- .../v1/assetserviceclient/updatefeed/AsyncUpdateFeed.java | 4 ++-- .../v1/assetserviceclient/updatefeed/SyncUpdateFeed.java | 4 ++-- .../v1/assetserviceclient/updatefeed/SyncUpdateFeedFeed.java | 4 ++-- .../batchgetassetshistory/SyncBatchGetAssetsHistory.java | 4 ++-- .../batchgetassetshistory/SyncBatchGetAssetsHistory.java | 4 ++-- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../v1/iamcredentialsclient/create/SyncCreateSetEndpoint.java | 4 ++-- .../generateaccesstoken/AsyncGenerateAccessToken.java | 4 ++-- .../generateaccesstoken/SyncGenerateAccessToken.java | 4 ++-- ...ssTokenServiceaccountnameListstringListstringDuration.java | 4 ++-- ...GenerateAccessTokenStringListstringListstringDuration.java | 4 ++-- .../generateidtoken/AsyncGenerateIdToken.java | 4 ++-- .../generateidtoken/SyncGenerateIdToken.java | 4 ++-- ...erateIdTokenServiceaccountnameListstringStringBoolean.java | 4 ++-- .../SyncGenerateIdTokenStringListstringStringBoolean.java | 4 ++-- .../v1/iamcredentialsclient/signblob/AsyncSignBlob.java | 4 ++-- .../v1/iamcredentialsclient/signblob/SyncSignBlob.java | 4 ++-- .../SyncSignBlobServiceaccountnameListstringBytestring.java | 4 ++-- .../signblob/SyncSignBlobStringListstringBytestring.java | 4 ++-- .../v1/iamcredentialsclient/signjwt/AsyncSignJwt.java | 4 ++-- .../v1/iamcredentialsclient/signjwt/SyncSignJwt.java | 4 ++-- .../SyncSignJwtServiceaccountnameListstringString.java | 4 ++-- .../signjwt/SyncSignJwtStringListstringString.java | 4 ++-- .../generateaccesstoken/SyncGenerateAccessToken.java | 4 ++-- .../generateaccesstoken/SyncGenerateAccessToken.java | 4 ++-- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java | 4 ++-- .../v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java | 4 ++-- .../iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java | 4 ++-- .../v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java | 4 ++-- .../iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java | 4 ++-- .../testiampermissions/AsyncTestIamPermissions.java | 4 ++-- .../testiampermissions/SyncTestIamPermissions.java | 4 ++-- .../v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java | 4 ++-- .../iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java | 4 ++-- .../asymmetricdecrypt/AsyncAsymmetricDecrypt.java | 4 ++-- .../asymmetricdecrypt/SyncAsymmetricDecrypt.java | 4 ++-- .../SyncAsymmetricDecryptCryptokeyversionnameBytestring.java | 4 ++-- .../SyncAsymmetricDecryptStringBytestring.java | 4 ++-- .../asymmetricsign/AsyncAsymmetricSign.java | 4 ++-- .../asymmetricsign/SyncAsymmetricSign.java | 4 ++-- .../SyncAsymmetricSignCryptokeyversionnameDigest.java | 4 ++-- .../asymmetricsign/SyncAsymmetricSignStringDigest.java | 4 ++-- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../create/SyncCreateSetEndpoint.java | 4 ++-- .../createcryptokey/AsyncCreateCryptoKey.java | 4 ++-- .../createcryptokey/SyncCreateCryptoKey.java | 4 ++-- .../SyncCreateCryptoKeyKeyringnameStringCryptokey.java | 4 ++-- .../SyncCreateCryptoKeyStringStringCryptokey.java | 4 ++-- .../createcryptokeyversion/AsyncCreateCryptoKeyVersion.java | 4 ++-- .../createcryptokeyversion/SyncCreateCryptoKeyVersion.java | 4 ++-- ...ncCreateCryptoKeyVersionCryptokeynameCryptokeyversion.java | 4 ++-- .../SyncCreateCryptoKeyVersionStringCryptokeyversion.java | 4 ++-- .../createimportjob/AsyncCreateImportJob.java | 4 ++-- .../createimportjob/SyncCreateImportJob.java | 4 ++-- .../SyncCreateImportJobKeyringnameStringImportjob.java | 4 ++-- .../SyncCreateImportJobStringStringImportjob.java | 4 ++-- .../createkeyring/AsyncCreateKeyRing.java | 4 ++-- .../createkeyring/SyncCreateKeyRing.java | 4 ++-- .../SyncCreateKeyRingLocationnameStringKeyring.java | 4 ++-- .../createkeyring/SyncCreateKeyRingStringStringKeyring.java | 4 ++-- .../v1/keymanagementserviceclient/decrypt/AsyncDecrypt.java | 4 ++-- .../v1/keymanagementserviceclient/decrypt/SyncDecrypt.java | 4 ++-- .../decrypt/SyncDecryptCryptokeynameBytestring.java | 4 ++-- .../decrypt/SyncDecryptStringBytestring.java | 4 ++-- .../destroycryptokeyversion/AsyncDestroyCryptoKeyVersion.java | 4 ++-- .../destroycryptokeyversion/SyncDestroyCryptoKeyVersion.java | 4 ++-- .../SyncDestroyCryptoKeyVersionCryptokeyversionname.java | 4 ++-- .../SyncDestroyCryptoKeyVersionString.java | 4 ++-- .../v1/keymanagementserviceclient/encrypt/AsyncEncrypt.java | 4 ++-- .../v1/keymanagementserviceclient/encrypt/SyncEncrypt.java | 4 ++-- .../encrypt/SyncEncryptResourcenameBytestring.java | 4 ++-- .../encrypt/SyncEncryptStringBytestring.java | 4 ++-- .../getcryptokey/AsyncGetCryptoKey.java | 4 ++-- .../getcryptokey/SyncGetCryptoKey.java | 4 ++-- .../getcryptokey/SyncGetCryptoKeyCryptokeyname.java | 4 ++-- .../getcryptokey/SyncGetCryptoKeyString.java | 4 ++-- .../getcryptokeyversion/AsyncGetCryptoKeyVersion.java | 4 ++-- .../getcryptokeyversion/SyncGetCryptoKeyVersion.java | 4 ++-- .../SyncGetCryptoKeyVersionCryptokeyversionname.java | 4 ++-- .../getcryptokeyversion/SyncGetCryptoKeyVersionString.java | 4 ++-- .../getiampolicy/AsyncGetIamPolicy.java | 4 ++-- .../getiampolicy/SyncGetIamPolicy.java | 4 ++-- .../getimportjob/AsyncGetImportJob.java | 4 ++-- .../getimportjob/SyncGetImportJob.java | 4 ++-- .../getimportjob/SyncGetImportJobImportjobname.java | 4 ++-- .../getimportjob/SyncGetImportJobString.java | 4 ++-- .../getkeyring/AsyncGetKeyRing.java | 4 ++-- .../keymanagementserviceclient/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 ++-- .../getpublickey/SyncGetPublicKeyCryptokeyversionname.java | 4 ++-- .../getpublickey/SyncGetPublicKeyString.java | 4 ++-- .../importcryptokeyversion/AsyncImportCryptoKeyVersion.java | 4 ++-- .../importcryptokeyversion/SyncImportCryptoKeyVersion.java | 4 ++-- .../listcryptokeys/AsyncListCryptoKeys.java | 4 ++-- .../listcryptokeys/AsyncListCryptoKeysPaged.java | 4 ++-- .../listcryptokeys/SyncListCryptoKeys.java | 4 ++-- .../listcryptokeys/SyncListCryptoKeysKeyringname.java | 4 ++-- .../listcryptokeys/SyncListCryptoKeysString.java | 4 ++-- .../listcryptokeyversions/AsyncListCryptoKeyVersions.java | 4 ++-- .../AsyncListCryptoKeyVersionsPaged.java | 4 ++-- .../listcryptokeyversions/SyncListCryptoKeyVersions.java | 4 ++-- .../SyncListCryptoKeyVersionsCryptokeyname.java | 4 ++-- .../SyncListCryptoKeyVersionsString.java | 4 ++-- .../listimportjobs/AsyncListImportJobs.java | 4 ++-- .../listimportjobs/AsyncListImportJobsPaged.java | 4 ++-- .../listimportjobs/SyncListImportJobs.java | 4 ++-- .../listimportjobs/SyncListImportJobsKeyringname.java | 4 ++-- .../listimportjobs/SyncListImportJobsString.java | 4 ++-- .../listkeyrings/AsyncListKeyRings.java | 4 ++-- .../listkeyrings/AsyncListKeyRingsPaged.java | 4 ++-- .../listkeyrings/SyncListKeyRings.java | 4 ++-- .../listkeyrings/SyncListKeyRingsLocationname.java | 4 ++-- .../listkeyrings/SyncListKeyRingsString.java | 4 ++-- .../listlocations/AsyncListLocations.java | 4 ++-- .../listlocations/AsyncListLocationsPaged.java | 4 ++-- .../listlocations/SyncListLocations.java | 4 ++-- .../restorecryptokeyversion/AsyncRestoreCryptoKeyVersion.java | 4 ++-- .../restorecryptokeyversion/SyncRestoreCryptoKeyVersion.java | 4 ++-- .../SyncRestoreCryptoKeyVersionCryptokeyversionname.java | 4 ++-- .../SyncRestoreCryptoKeyVersionString.java | 4 ++-- .../testiampermissions/AsyncTestIamPermissions.java | 4 ++-- .../testiampermissions/SyncTestIamPermissions.java | 4 ++-- .../updatecryptokey/AsyncUpdateCryptoKey.java | 4 ++-- .../updatecryptokey/SyncUpdateCryptoKey.java | 4 ++-- .../SyncUpdateCryptoKeyCryptokeyFieldmask.java | 4 ++-- .../AsyncUpdateCryptoKeyPrimaryVersion.java | 4 ++-- .../SyncUpdateCryptoKeyPrimaryVersion.java | 4 ++-- .../SyncUpdateCryptoKeyPrimaryVersionCryptokeynameString.java | 4 ++-- .../SyncUpdateCryptoKeyPrimaryVersionStringString.java | 4 ++-- .../updatecryptokeyversion/AsyncUpdateCryptoKeyVersion.java | 4 ++-- .../updatecryptokeyversion/SyncUpdateCryptoKeyVersion.java | 4 ++-- .../SyncUpdateCryptoKeyVersionCryptokeyversionFieldmask.java | 4 ++-- .../getkeyring/SyncGetKeyRing.java | 4 ++-- .../getkeyring/SyncGetKeyRing.java | 4 ++-- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../v1/libraryserviceclient/create/SyncCreateSetEndpoint.java | 4 ++-- .../v1/libraryserviceclient/createbook/AsyncCreateBook.java | 4 ++-- .../v1/libraryserviceclient/createbook/SyncCreateBook.java | 4 ++-- .../createbook/SyncCreateBookShelfnameBook.java | 4 ++-- .../createbook/SyncCreateBookStringBook.java | 4 ++-- .../v1/libraryserviceclient/createshelf/AsyncCreateShelf.java | 4 ++-- .../v1/libraryserviceclient/createshelf/SyncCreateShelf.java | 4 ++-- .../createshelf/SyncCreateShelfShelf.java | 4 ++-- .../v1/libraryserviceclient/deletebook/AsyncDeleteBook.java | 4 ++-- .../v1/libraryserviceclient/deletebook/SyncDeleteBook.java | 4 ++-- .../deletebook/SyncDeleteBookBookname.java | 4 ++-- .../libraryserviceclient/deletebook/SyncDeleteBookString.java | 4 ++-- .../v1/libraryserviceclient/deleteshelf/AsyncDeleteShelf.java | 4 ++-- .../v1/libraryserviceclient/deleteshelf/SyncDeleteShelf.java | 4 ++-- .../deleteshelf/SyncDeleteShelfShelfname.java | 4 ++-- .../deleteshelf/SyncDeleteShelfString.java | 4 ++-- .../library/v1/libraryserviceclient/getbook/AsyncGetBook.java | 4 ++-- .../library/v1/libraryserviceclient/getbook/SyncGetBook.java | 4 ++-- .../v1/libraryserviceclient/getbook/SyncGetBookBookname.java | 4 ++-- .../v1/libraryserviceclient/getbook/SyncGetBookString.java | 4 ++-- .../v1/libraryserviceclient/getshelf/AsyncGetShelf.java | 4 ++-- .../v1/libraryserviceclient/getshelf/SyncGetShelf.java | 4 ++-- .../libraryserviceclient/getshelf/SyncGetShelfShelfname.java | 4 ++-- .../v1/libraryserviceclient/getshelf/SyncGetShelfString.java | 4 ++-- .../v1/libraryserviceclient/listbooks/AsyncListBooks.java | 4 ++-- .../libraryserviceclient/listbooks/AsyncListBooksPaged.java | 4 ++-- .../v1/libraryserviceclient/listbooks/SyncListBooks.java | 4 ++-- .../listbooks/SyncListBooksShelfname.java | 4 ++-- .../libraryserviceclient/listbooks/SyncListBooksString.java | 4 ++-- .../v1/libraryserviceclient/listshelves/AsyncListShelves.java | 4 ++-- .../listshelves/AsyncListShelvesPaged.java | 4 ++-- .../v1/libraryserviceclient/listshelves/SyncListShelves.java | 4 ++-- .../libraryserviceclient/mergeshelves/AsyncMergeShelves.java | 4 ++-- .../libraryserviceclient/mergeshelves/SyncMergeShelves.java | 4 ++-- .../mergeshelves/SyncMergeShelvesShelfnameShelfname.java | 4 ++-- .../mergeshelves/SyncMergeShelvesShelfnameString.java | 4 ++-- .../mergeshelves/SyncMergeShelvesStringShelfname.java | 4 ++-- .../mergeshelves/SyncMergeShelvesStringString.java | 4 ++-- .../v1/libraryserviceclient/movebook/AsyncMoveBook.java | 4 ++-- .../v1/libraryserviceclient/movebook/SyncMoveBook.java | 4 ++-- .../movebook/SyncMoveBookBooknameShelfname.java | 4 ++-- .../movebook/SyncMoveBookBooknameString.java | 4 ++-- .../movebook/SyncMoveBookStringShelfname.java | 4 ++-- .../movebook/SyncMoveBookStringString.java | 4 ++-- .../v1/libraryserviceclient/updatebook/AsyncUpdateBook.java | 4 ++-- .../v1/libraryserviceclient/updatebook/SyncUpdateBook.java | 4 ++-- .../updatebook/SyncUpdateBookBookFieldmask.java | 4 ++-- .../libraryservicesettings/createshelf/SyncCreateShelf.java | 4 ++-- .../createshelf/SyncCreateShelf.java | 4 ++-- 231 files changed, 462 insertions(+), 462 deletions(-) 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/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/iampolicyclient/create/SyncCreateSetCredentialsProvider.java index 4cd74600b9..b37d86e99d 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/iampolicyclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_create_setcredentialsprovider_sync] +// [START api_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_iampolicyclient_create_setcredentialsprovider_sync] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/create/SyncCreateSetEndpoint.java index 16fdc64355..ef3ef1a243 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/iampolicyclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_create_setendpoint_sync] +// [START api_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_iampolicyclient_create_setendpoint_sync] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java index 441d834597..e32d0d5163 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/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_getiampolicy_async] +// [START api_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_iampolicyclient_getiampolicy_async] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/getiampolicy/SyncGetIamPolicy.java index ac82d3739c..14aa20bece 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/iampolicyclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_getiampolicy_sync] +// [START api_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_iampolicyclient_getiampolicy_sync] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java index 2aea2886b9..1b1f753841 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/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_setiampolicy_async] +// [START api_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_iampolicyclient_setiampolicy_async] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/setiampolicy/SyncSetIamPolicy.java index 9e01e5cf1f..c919350e57 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/iampolicyclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_setiampolicy_sync] +// [START api_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_iampolicyclient_setiampolicy_sync] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java index 4e7920f9cc..80f442ba1b 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/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_testiampermissions_async] +// [START api_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_iampolicyclient_testiampermissions_async] +// [END api_v1_generated_iampolicyclient_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/iampolicyclient/testiampermissions/SyncTestIamPermissions.java index 241d958b43..dd955eb1ce 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/iampolicyclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START iam_v1_generated_iampolicyclient_testiampermissions_sync] +// [START api_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_iampolicyclient_testiampermissions_sync] +// [END api_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 07c44e3f36..adea1c058c 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 api_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 api_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..18415698d4 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 api_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 api_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/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 be78a8944653c433b0e97ee74067f4f8fa414e38 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Fri, 16 Sep 2022 14:56:18 -0400 Subject: [PATCH 03/21] update to lowerCamelCase --- .../com/google/api/generator/gapic/composer/ComposerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 91409151ed..7eef661ff9 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 @@ -40,7 +40,7 @@ public class ComposerTest { private final Sample sample = Sample.builder() .setRegionTag( - RegionTag.builder().setServiceName("servicename").setRpcName("rpcname").build()) + RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build()) .build(); private List ListofSamples = Arrays.asList(new Sample[] {sample}); private final String protoPackage = echoProtoService.protoPakkage(); From 4007abdc858c513afa1133d3c59a70ea666d05fc Mon Sep 17 00:00:00 2001 From: Alice Li Date: Fri, 16 Sep 2022 15:03:39 -0400 Subject: [PATCH 04/21] use explicit imports --- .../com/google/api/generator/gapic/composer/Composer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 2bc38a3c51..659c5e32b7 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 @@ -30,7 +30,12 @@ import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer; import com.google.api.generator.gapic.composer.rest.HttpJsonServiceCallableFactoryClassComposer; import com.google.api.generator.gapic.composer.rest.HttpJsonServiceStubClassComposer; -import com.google.api.generator.gapic.model.*; +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.Sample; +import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.model.Transport; import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.Arrays; From 037440c94d666adfadaa7627f90ddcd6d597ab65 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 19 Sep 2022 17:02:09 -0400 Subject: [PATCH 05/21] remove setting default host where it's not needed for samples and refactor parseDefaultHost --- .../generator/gapic/composer/Composer.java | 20 ++++--------- ...ctServiceCallableFactoryClassComposer.java | 2 +- .../AbstractServiceClientClassComposer.java | 4 +-- ...bstractServiceClientTestClassComposer.java | 2 +- .../AbstractServiceSettingsClassComposer.java | 4 +-- .../AbstractServiceStubClassComposer.java | 2 +- ...tractServiceStubSettingsClassComposer.java | 6 ++-- ...ractTransportServiceStubClassComposer.java | 2 +- .../grpc/MockServiceClassComposer.java | 2 +- .../grpc/MockServiceImplClassComposer.java | 2 +- .../ResourceNameHelperClassComposer.java | 4 +-- .../api/generator/gapic/model/GapicClass.java | 18 ----------- .../gapic/composer/ComposerTest.java | 6 +--- ...rviceCallableFactoryClassComposerTest.java | 4 +-- .../GrpcServiceStubClassComposerTest.java | 12 ++++---- .../ServiceClientTestClassComposerTest.java | 30 ++++--------------- .../grpc/ServiceStubClassComposerTest.java | 8 ++--- 17 files changed, 35 insertions(+), 93 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 659c5e32b7..d89817d3cf 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,10 +37,11 @@ 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; -import java.util.regex.Pattern; import java.util.stream.Collectors; public class Composer { @@ -223,25 +224,14 @@ sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion)) // Will keep backup name parsed from proto package for now. @VisibleForTesting protected static String parseDefaultHost(String defaultHost) { - String apiShortName; - String apiShortNameHelper; // If the defaultHost is of the format "**.googleapis.com", take the name before the first // period. - Pattern standardApiHost = Pattern.compile("\\."); + 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 - Pattern regionalApiHost = Pattern.compile("-"); - apiShortNameHelper = standardApiHost.split(defaultHost)[0]; - apiShortName = defaultHost; - if (standardApiHost.split(defaultHost).length > 1 - && regionalApiHost.split(defaultHost).length > 1) { - apiShortName = - regionalApiHost - .split(apiShortNameHelper)[regionalApiHost.split(apiShortNameHelper).length - 1]; - } else { - apiShortName = apiShortNameHelper; - } + apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); + // TODO: alicejli will need to handle special case for `iam-meta-api` service return apiShortName; } diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java index 06922f63dd..9fcbaa0f9e 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java @@ -83,7 +83,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, typeStore)) .setScope(ScopeNode.PUBLIC) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef); } protected List createClassAnnotations(Service service, TypeStore typeStore) { 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 a56cc55e2f..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,8 +163,8 @@ public GapicClass generate(GapicContext context, Service service) { .build(); updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames); - return GapicClass.create( - kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples), service.defaultHost()); + 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/AbstractServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java index 1800193e37..896607982c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java @@ -127,7 +127,7 @@ protected GapicClass generate(String className, GapicContext context, Service se .setMethods( createClassMethods(service, context, classMemberVarExprs, typeStore, resourceNames)) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef); } protected boolean isSupportedMethod(Method method) { 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 7c0bcbf148..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,8 +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), service.defaultHost()); + 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/AbstractServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java index d2456feb8e..c9835c69e4 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java @@ -87,7 +87,7 @@ public GapicClass generate(GapicContext context, Service service) { .setMethods(createClassMethods(service, messageTypes, typeStore)) .setScope(ScopeNode.PUBLIC) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef); } private static List createClassAnnotations(Service service, TypeStore typeStore) { 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 be920d8a77..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,10 +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), - service.defaultHost()); + 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/common/AbstractTransportServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java index f648378c53..c2f4fb7473 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java @@ -215,7 +215,7 @@ public GapicClass generate(GapicContext context, Service service) { classStatements)) .setStatements(classStatements) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef); } protected boolean isSupportedMethod(Method method) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java index 5329d4c1be..f1fedc8798 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java @@ -69,7 +69,7 @@ public GapicClass generate(GapicContext ignored, Service service) { .setStatements(createFieldDeclarations(service, typeStore)) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef).withDefaultHost(service.defaultHost()); } private static List createFieldDeclarations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java index ddfe6ade7e..2bdadf148b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java @@ -126,7 +126,7 @@ public GapicClass generate(GapicContext context, Service service) { .setStatements(createFieldDeclarations()) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef, service.defaultHost()); + return GapicClass.create(kind, classDef).withDefaultHost(service.defaultHost()); } private static List createFieldDeclarations() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index 5b29219aff..e6922e9d62 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -149,8 +149,8 @@ public GapicClass generate(ResourceName resourceName, GapicContext context) { createNestedBuilderClasses( resourceName, tokenHierarchies, templateFinalVarExprs, typeStore)) .build(); - return GapicClass.create( - GapicClass.Kind.PROTO, classDef, context.services().get(0).defaultHost()); + return GapicClass.create(GapicClass.Kind.PROTO, classDef) + .withDefaultHost(context.services().get(0).defaultHost()); } private static List createClassAnnotations() { 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 4ec61770b8..7c5230da31 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 @@ -46,24 +46,6 @@ public static GapicClass create( return builder().setKind(kind).setClassDefinition(classDefinition).setSamples(samples).build(); } - public static GapicClass create(Kind kind, ClassDefinition classDefinition, String defaultHost) { - return builder() - .setKind(kind) - .setClassDefinition(classDefinition) - .setDefaultHost(defaultHost) - .build(); - } - - public static GapicClass create( - Kind kind, ClassDefinition classDefinition, List samples, String defaultHost) { - return builder() - .setKind(kind) - .setClassDefinition(classDefinition) - .setSamples(samples) - .setDefaultHost(defaultHost) - .build(); - } - static Builder builder() { return new AutoValue_GapicClass.Builder() .setSamples(Collections.emptyList()) 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 7eef661ff9..5cb7882db5 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 @@ -71,17 +71,13 @@ public void composeSamples_showcase() { List composedSamples = Composer.prepareExecutableSamples(testClassList, protoPackage).get(0).samples(); - // Assert.assertCodeEquals(composedSamples.toString(), "egg"); assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { assertEquals( "File header should be APACHE", Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), sample.fileHeader()); - assertEquals( - "ApiShortName should be Localhost7469", - "Localhost7469", - sample.regionTag().apiShortName()); + assertEquals("ApiShortName should be empty", "", sample.regionTag().apiShortName()); assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion()); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java index dfe7e9a66a..f6ec7612ae 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java @@ -30,7 +30,7 @@ public void generateServiceClasses() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -42,6 +42,6 @@ public void generateServiceClasses_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java index a708288aa9..544b5c131a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java @@ -29,7 +29,7 @@ public void generateGrpcServiceStubClass_simple() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -40,7 +40,7 @@ public void generateGrpcServiceStubClass_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -51,7 +51,7 @@ public void generateGrpcServiceStubClass_httpBindings() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcTestingStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -63,7 +63,7 @@ public void generateGrpcServiceStubClass_routingHeaders() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcRoutingHeadersStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -74,7 +74,7 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcPublisherStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "pubsub.googleapis.com:443"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -85,6 +85,6 @@ public void generateGrpcServiceStubClass_createBatchingCallable() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcLoggingStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "logging.googleapis.com:443"); + Assert.assertCodeEquals(clazz.defaultHost(), ""); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java index 6e67fe2d35..7b940ee8d9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java @@ -30,36 +30,16 @@ public class ServiceClientTestClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - { - "EchoClientTest", - GrpcTestProtoLoader.instance().parseShowcaseEcho(), - 0, - "localhost:7469" - }, + {"EchoClientTest", GrpcTestProtoLoader.instance().parseShowcaseEcho(), 0, ""}, { "DeprecatedServiceClientTest", GrpcTestProtoLoader.instance().parseDeprecatedService(), 0, - "localhost:7469" - }, - { - "TestingClientTest", - GrpcTestProtoLoader.instance().parseShowcaseTesting(), - 0, - "localhost:7469" - }, - { - "SubscriberClientTest", - GrpcTestProtoLoader.instance().parsePubSubPublisher(), - 1, - "pubsub.googleapis.com:443" - }, - { - "LoggingClientTest", - GrpcTestProtoLoader.instance().parseLogging(), - 0, - "logging.googleapis.com:443" + "" }, + {"TestingClientTest", GrpcTestProtoLoader.instance().parseShowcaseTesting(), 0, ""}, + {"SubscriberClientTest", GrpcTestProtoLoader.instance().parsePubSubPublisher(), 1, ""}, + {"LoggingClientTest", GrpcTestProtoLoader.instance().parseLogging(), 0, ""}, }); } 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 1d144d2714..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,12 +31,8 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, - { - "DeprecatedServiceStub", - TestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" - } + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), ""}, + {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), ""} }); } From e21ec74fe45340477dbb9f1db20b81ea7fd61518 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 15 Sep 2022 14:14:30 +0200 Subject: [PATCH 06/21] 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 7f4b9b43a4b151408ada87edb8a168f75df8c715 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Sep 2022 16:24:36 +0200 Subject: [PATCH 07/21] 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 1439fd8bd89af5e997b4c3d2f638f1a28953544d Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 20 Sep 2022 17:45:08 -0400 Subject: [PATCH 08/21] update iam oneoff --- .../com/google/api/generator/gapic/composer/Composer.java | 5 ++++- .../create/SyncCreateSetCredentialsProvider.java | 4 ++-- .../iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java | 4 ++-- .../v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java | 4 ++-- .../v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java | 4 ++-- .../v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java | 4 ++-- .../v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java | 4 ++-- .../testiampermissions/AsyncTestIamPermissions.java | 4 ++-- .../testiampermissions/SyncTestIamPermissions.java | 4 ++-- .../v1/iampolicysettings/setiampolicy/SyncSetIamPolicy.java | 4 ++-- .../iampolicystubsettings/setiampolicy/SyncSetIamPolicy.java | 4 ++-- 11 files changed, 24 insertions(+), 21 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 d89817d3cf..0d58dda412 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 @@ -231,7 +231,10 @@ protected static String parseDefaultHost(String defaultHost) { // 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); - // TODO: alicejli will need to handle special case for `iam-meta-api` service + // `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/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/iampolicyclient/create/SyncCreateSetCredentialsProvider.java index b37d86e99d..4cd74600b9 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/iampolicyclient/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/create/SyncCreateSetEndpoint.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/create/SyncCreateSetEndpoint.java index ef3ef1a243..16fdc64355 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/iampolicyclient/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java index e32d0d5163..441d834597 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/iampolicyclient/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/getiampolicy/SyncGetIamPolicy.java index 14aa20bece..ac82d3739c 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/iampolicyclient/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java index 1b1f753841..2aea2886b9 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/iampolicyclient/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/setiampolicy/SyncSetIamPolicy.java index c919350e57..9e01e5cf1f 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/iampolicyclient/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java index 80f442ba1b..4e7920f9cc 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/iampolicyclient/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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/iampolicyclient/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/iam/samples/snippets/generated/main/java/com/google/iam/v1/iampolicyclient/testiampermissions/SyncTestIamPermissions.java index dd955eb1ce..241d958b43 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/iampolicyclient/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.iam.v1.samples; -// [START api_v1_generated_iampolicyclient_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 api_v1_generated_iampolicyclient_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 adea1c058c..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 api_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 api_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 18415698d4..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 api_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 api_v1_generated_iampolicystubsettings_setiampolicy_sync] +// [END iam_v1_generated_iampolicystubsettings_setiampolicy_sync] From 88aa87961aabaf6e07e1a570ae21b0e7a1f772f8 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 20 Sep 2022 17:50:43 -0400 Subject: [PATCH 09/21] linter --- .../com/google/api/generator/gapic/composer/Composer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 0d58dda412..ef191f2c3a 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 @@ -232,9 +232,9 @@ protected static String parseDefaultHost(String defaultHost) { // 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"; - } + if (defaultHost.contains("iam-meta-api")) { + apiShortName = "iam"; + } return apiShortName; } From 66eab8cda03206b243d7cfea5cb0f33005436023 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 26 Sep 2022 16:30:15 +0200 Subject: [PATCH 10/21] 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 ddbc67b80d26487a555170f083ef3dd3c2cff063 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 27 Sep 2022 13:03:22 -0400 Subject: [PATCH 11/21] refactor prepareExecutableSamples --- .../generator/gapic/composer/Composer.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 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 ef191f2c3a..8fd980da8e 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 @@ -203,20 +203,21 @@ static List prepareExecutableSamples(List clazzes, Strin } else { apiVersion = ""; } - // Include license header, apiShortName, and apiVersion - return clazzes.stream() - .map( - gapicClass -> { - List samples = - gapicClass.samples().stream() - .map( - sample -> - addRegionTagAndHeaderToSample( - sample, parseDefaultHost(gapicClass.defaultHost()), 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; } // Parse defaultHost for apiShortName. Need to account for regional default endpoints like From cc3f4a0849e2017d50d8f5b9aa7ebce5c5e9c006 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 27 Sep 2022 13:44:56 -0400 Subject: [PATCH 12/21] fix imports --- .../api/generator/gapic/composer/ComposerTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 5cb7882db5..099ce27418 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 @@ -14,15 +14,21 @@ package com.google.api.generator.gapic.composer; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; -import com.google.api.generator.engine.ast.*; +import com.google.api.generator.engine.ast.ClassDefinition; +import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.writer.JavaWriterVisitor; 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.GrpcTestProtoLoader; -import com.google.api.generator.gapic.model.*; +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 java.nio.file.Path; From dc9258a2575c1aa9f8569544733faf1b2761aa26 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 27 Sep 2022 13:54:49 -0400 Subject: [PATCH 13/21] update name of unit test --- .../com/google/api/generator/gapic/composer/ComposerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 099ce27418..d0df8aaaf8 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 @@ -89,7 +89,7 @@ public void composeSamples_showcase() { } @Test - public void parseDefaultHostTest() { + public void parseDefaultHost_returnsApiShortName() { String defaultHost = "us-east1-pubsub.googleapis.com"; String apiShortName = Composer.parseDefaultHost(defaultHost); org.junit.Assert.assertEquals("pubsub", apiShortName); From e50dc0374d4f4d649a56a4f3b98adf6d1da2ff9e Mon Sep 17 00:00:00 2001 From: Alice Li Date: Tue, 27 Sep 2022 16:55:07 -0400 Subject: [PATCH 14/21] update comment --- .../java/com/google/api/generator/gapic/composer/Composer.java | 1 - 1 file changed, 1 deletion(-) 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 8fd980da8e..3fc34c041c 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 @@ -222,7 +222,6 @@ static List prepareExecutableSamples(List clazzes, Strin // Parse defaultHost for apiShortName. Need to account for regional default endpoints like // "us-east1-pubsub.googleapis.com". - // Will keep backup name parsed from proto package for now. @VisibleForTesting protected static String parseDefaultHost(String defaultHost) { // If the defaultHost is of the format "**.googleapis.com", take the name before the first From 66036054328ce54e23bb8430b7a2b3272accd4b7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 3 Oct 2022 15:46:22 +0200 Subject: [PATCH 15/21] 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 8f583d188bdea6718edb1ac7eefed29467777629 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Mon, 3 Oct 2022 16:10:19 +0000 Subject: [PATCH 16/21] 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 59d9ffd33ce77b2ee3bf083ab5310752587119f0 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 10 Oct 2022 11:24:23 -0400 Subject: [PATCH 17/21] refactor unit tests --- .../gapic/composer/ComposerTest.java | 36 ++++++++++++------- ...rviceCallableFactoryClassComposerTest.java | 2 -- .../GrpcServiceStubClassComposerTest.java | 6 ---- .../ServiceClientTestClassComposerTest.java | 15 +++----- 4 files changed, 29 insertions(+), 30 deletions(-) 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 d0df8aaaf8..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 @@ -89,28 +89,40 @@ public void composeSamples_showcase() { } @Test - public void parseDefaultHost_returnsApiShortName() { + public void parseDefaultHost_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { String defaultHost = "us-east1-pubsub.googleapis.com"; String apiShortName = Composer.parseDefaultHost(defaultHost); - org.junit.Assert.assertEquals("pubsub", apiShortName); + assertEquals("pubsub", apiShortName); + } + + @Test + public void parseDefaultHost_shouldReturnApiShortName() { + String defaultHost = "logging.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("logging", apiShortName); + } - defaultHost = "logging.googleapis.com"; - apiShortName = Composer.parseDefaultHost(defaultHost); - org.junit.Assert.assertEquals("logging", apiShortName); + @Test + public void parseDefaultHost_shouldReturnApiShortNameForIam() { + String defaultHost = "iam-meta-api.googleapis.com"; + String apiShortName = Composer.parseDefaultHost(defaultHost); + assertEquals("iam", apiShortName); + } - defaultHost = "localhost:7469"; - apiShortName = Composer.parseDefaultHost(defaultHost); - org.junit.Assert.assertEquals("localhost:7469", 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"); - org.junit.Assert.assertEquals("Showcase", testSample.regionTag().apiShortName()); - org.junit.Assert.assertEquals("V1", testSample.regionTag().apiVersion()); - org.junit.Assert.assertEquals( - Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), testSample.fileHeader()); + assertEquals("Showcase", testSample.regionTag().apiShortName()); + assertEquals("V1", testSample.regionTag().apiVersion()); + assertEquals(Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), testSample.fileHeader()); } @Test diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java index f6ec7612ae..7269d61140 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposerTest.java @@ -30,7 +30,6 @@ public void generateServiceClasses() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -42,6 +41,5 @@ public void generateServiceClasses_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceCallableFactory.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java index 544b5c131a..f41143acbe 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java @@ -29,7 +29,6 @@ public void generateGrpcServiceStubClass_simple() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcEchoStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -40,7 +39,6 @@ public void generateGrpcServiceStubClass_deprecated() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcDeprecatedServiceStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -51,7 +49,6 @@ public void generateGrpcServiceStubClass_httpBindings() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcTestingStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -63,7 +60,6 @@ public void generateGrpcServiceStubClass_routingHeaders() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcRoutingHeadersStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -74,7 +70,6 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcPublisherStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } @Test @@ -85,6 +80,5 @@ public void generateGrpcServiceStubClass_createBatchingCallable() { Assert.assertGoldenClass(this.getClass(), clazz, "GrpcLoggingStub.golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), ""); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java index 7b940ee8d9..0eca4e060d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposerTest.java @@ -30,16 +30,15 @@ public class ServiceClientTestClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoClientTest", GrpcTestProtoLoader.instance().parseShowcaseEcho(), 0, ""}, + {"EchoClientTest", GrpcTestProtoLoader.instance().parseShowcaseEcho(), 0}, { "DeprecatedServiceClientTest", GrpcTestProtoLoader.instance().parseDeprecatedService(), - 0, - "" + 0 }, - {"TestingClientTest", GrpcTestProtoLoader.instance().parseShowcaseTesting(), 0, ""}, - {"SubscriberClientTest", GrpcTestProtoLoader.instance().parsePubSubPublisher(), 1, ""}, - {"LoggingClientTest", GrpcTestProtoLoader.instance().parseLogging(), 0, ""}, + {"TestingClientTest", GrpcTestProtoLoader.instance().parseShowcaseTesting(), 0}, + {"SubscriberClientTest", GrpcTestProtoLoader.instance().parsePubSubPublisher(), 1}, + {"LoggingClientTest", GrpcTestProtoLoader.instance().parseLogging(), 0}, }); } @@ -51,9 +50,6 @@ public static Collection data() { @Parameterized.Parameter(2) public int serviceIndex; - @Parameterized.Parameter(3) - public String defaultHostExpected; - @Test public void generateServiceClientTestClasses() { Service echoProtoService = context.services().get(serviceIndex); @@ -62,6 +58,5 @@ public void generateServiceClientTestClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); } } From 70c84b48541a53153ff10de60c92512af811f2d9 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 10 Oct 2022 11:51:29 -0400 Subject: [PATCH 18/21] refactor composers --- .../composer/grpc/MockServiceClassComposer.java | 2 +- .../composer/grpc/MockServiceImplClassComposer.java | 2 +- .../ResourceNameHelperClassComposer.java | 3 +-- .../google/api/generator/gapic/model/GapicClass.java | 2 ++ .../composer/grpc/MockServiceClassComposerTest.java | 1 - .../grpc/MockServiceImplClassComposerTest.java | 12 ++---------- .../ResourceNameHelperClassComposerTest.java | 6 ------ 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java index f1fedc8798..7227b4fe4a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java @@ -69,7 +69,7 @@ public GapicClass generate(GapicContext ignored, Service service) { .setStatements(createFieldDeclarations(service, typeStore)) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef).withDefaultHost(service.defaultHost()); + return GapicClass.create(kind, classDef); } private static List createFieldDeclarations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java index 2bdadf148b..e16cc875f4 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java @@ -126,7 +126,7 @@ public GapicClass generate(GapicContext context, Service service) { .setStatements(createFieldDeclarations()) .setMethods(createClassMethods(service, typeStore)) .build(); - return GapicClass.create(kind, classDef).withDefaultHost(service.defaultHost()); + return GapicClass.create(kind, classDef); } private static List createFieldDeclarations() { diff --git a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index e6922e9d62..f8c961ccab 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -149,8 +149,7 @@ public GapicClass generate(ResourceName resourceName, GapicContext context) { createNestedBuilderClasses( resourceName, tokenHierarchies, templateFinalVarExprs, typeStore)) .build(); - return GapicClass.create(GapicClass.Kind.PROTO, classDef) - .withDefaultHost(context.services().get(0).defaultHost()); + return GapicClass.create(GapicClass.Kind.PROTO, classDef); } private static List createClassAnnotations() { 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 7c5230da31..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,8 @@ 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) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java index 38d8309590..7762c6a4df 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposerTest.java @@ -47,6 +47,5 @@ public void generateMockServiceClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java index 40f332e666..aa062279ec 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposerTest.java @@ -30,12 +30,8 @@ public class MockServiceImplClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"MockEchoImpl", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, - { - "MockDeprecatedServiceImpl", - GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" - } + {"MockEchoImpl", GrpcTestProtoLoader.instance().parseShowcaseEcho()}, + {"MockDeprecatedServiceImpl", GrpcTestProtoLoader.instance().parseDeprecatedService()} }); } @@ -44,9 +40,6 @@ public static Collection data() { @Parameterized.Parameter(1) public GapicContext context; - @Parameterized.Parameter(2) - public String defaultHostExpected; - @Test public void generateMockServiceImplClasses() { Service service = context.services().get(0); @@ -54,6 +47,5 @@ public void generateMockServiceImplClasses() { 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/resourcename/ResourceNameHelperClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java index 98ec63ab51..c54218a52e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java @@ -110,7 +110,6 @@ public void generateResourceNameClass_echoFoobarMultiplePatterns() { Utils.saveCodegenToFile(this.getClass(), "FoobarName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "FoobarName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -155,9 +154,7 @@ public void generateResourceNameClass_loggingOnePatternMultipleVariables() { Utils.saveCodegenToFile(this.getClass(), "BillingAccountLocationName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "BillingAccountLocationName.golden"); - // TODO: line 159 fails - https://github.com/googleapis/gapic-generator-java/issues/805 Assert.assertCodeEquals(goldenFilePath, visitor.write()); - Assert.assertCodeEquals(clazz.defaultHost(), "logging.googleapis.com:443"); } @Test @@ -184,7 +181,6 @@ public void generateResourceNameClass_testingSessionOnePattern() { Utils.saveCodegenToFile(this.getClass(), "SessionName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "SessionName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -211,7 +207,6 @@ public void generateResourceNameClass_testingBlueprintPatternWithNonSlashSeparat Utils.saveCodegenToFile(this.getClass(), "TestName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "TestName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } @Test @@ -236,6 +231,5 @@ public void generateResourceNameClass_childSingleton() { Utils.saveCodegenToFile(this.getClass(), "AgentName.golden", visitor.write()); Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "AgentName.golden"); Assert.assertCodeEquals(goldenFilePath, visitor.write()); - Assert.assertCodeEquals(clazz.defaultHost(), "localhost:7469"); } } From fcc1cf3e13e321e16371e2b8362c7e651fff00e9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 10 Oct 2022 16:14:31 +0200 Subject: [PATCH 19/21] 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 c9578feded8621c84d43e062ca7bfc68b47b76db Mon Sep 17 00:00:00 2001 From: Alice Li Date: Wed, 12 Oct 2022 17:08:41 -0400 Subject: [PATCH 20/21] update comment --- .../java/com/google/api/generator/gapic/composer/Composer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3fc34c041c..32465d9312 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 @@ -220,7 +220,7 @@ static List prepareExecutableSamples(List clazzes, Strin return clazzesWithSamples; } - // Parse defaultHost for apiShortName. Need to account for regional default endpoints like + // 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) { From 9d8e2b98104f056d5431a4c3bb650c1f892fa979 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Wed, 12 Oct 2022 17:13:10 -0400 Subject: [PATCH 21/21] fix lint --- .../java/com/google/api/generator/gapic/composer/Composer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 32465d9312..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 @@ -220,7 +220,8 @@ static List prepareExecutableSamples(List clazzes, Strin return clazzesWithSamples; } - // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default endpoints like + // 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) {