From 5591a10ec8128515ffdebe03112447b796671d1b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 29 Oct 2022 00:16:21 +0200 Subject: [PATCH 1/5] chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 273e03b2d5..76416d39da 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.0 + 3.4.1 package From da4b13021ef91a334df5834ac919540e805bd754 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Mon, 31 Oct 2022 17:04:21 -0400 Subject: [PATCH 2/5] refactor: expose parsed api short name and version as fields in Service (#1075) * Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. * Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated) * This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process. --- .../generator/gapic/composer/Composer.java | 37 +-------- .../AbstractServiceClientClassComposer.java | 3 +- .../AbstractServiceSettingsClassComposer.java | 3 +- ...tractServiceStubSettingsClassComposer.java | 3 +- .../api/generator/gapic/model/GapicClass.java | 23 ++++-- .../api/generator/gapic/model/Service.java | 47 ++++++++++++ .../gapic/composer/ComposerTest.java | 74 ++++++++---------- .../grpc/ServiceClientClassComposerTest.java | 27 +++++-- .../ServiceSettingsClassComposerTest.java | 18 ++++- .../grpc/ServiceStubClassComposerTest.java | 12 ++- .../ServiceStubSettingsClassComposerTest.java | 22 ++++-- .../generator/gapic/model/ServiceTest.java | 75 +++++++++++++++++++ 12 files changed, 238 insertions(+), 106 deletions(-) create mode 100644 src/test/java/com/google/api/generator/gapic/model/ServiceTest.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 60d4f5dde2..acd914a163 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -37,8 +37,6 @@ import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.model.Transport; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -50,8 +48,7 @@ public static List composeServiceClasses(GapicContext context) { clazzes.addAll(generateServiceClasses(context)); clazzes.addAll(generateMockClasses(context, context.mixinServices())); clazzes.addAll(generateResourceNameHelperClasses(context)); - return addApacheLicense( - prepareExecutableSamples(clazzes, context.gapicMetadata().getProtoPackage())); + return addApacheLicense(prepareExecutableSamples(clazzes)); } public static GapicPackageInfo composePackageInfo(GapicContext context) { @@ -193,16 +190,7 @@ public static List generateTestClasses(GapicContext context) { } @VisibleForTesting - static List prepareExecutableSamples(List clazzes, String protoPackage) { - // parse protoPackage for apiVersion - String[] pakkage = protoPackage.split("\\."); - String apiVersion; - // e.g. v1, v2, v1beta1 - if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { - apiVersion = pakkage[pakkage.length - 1]; - } else { - apiVersion = ""; - } + static List prepareExecutableSamples(List clazzes) { // Include license header, apiShortName, and apiVersion List clazzesWithSamples = new ArrayList<>(); clazzes.forEach( @@ -214,31 +202,12 @@ static List prepareExecutableSamples(List clazzes, Strin sample -> samples.add( addRegionTagAndHeaderToSample( - sample, parseDefaultHost(gapicClass.defaultHost()), apiVersion))); + sample, gapicClass.apiShortName(), gapicClass.apiVersion()))); clazzesWithSamples.add(gapicClass.withSamples(samples)); }); return clazzesWithSamples; } - // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default - // endpoints like - // "us-east1-pubsub.googleapis.com". - @VisibleForTesting - protected static String parseDefaultHost(String defaultHost) { - // If the defaultHost is of the format "**.googleapis.com", take the name before the first - // period. - String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); - // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the - // first period and after the last dash to follow CSharp's implementation here: - // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 - apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); - // `iam-meta-api` service is an exceptional case and is handled as a one-off - if (defaultHost.contains("iam-meta-api")) { - apiShortName = "iam"; - } - return apiShortName; - } - @VisibleForTesting protected static Sample addRegionTagAndHeaderToSample( Sample sample, String apiShortName, String apiVersion) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index c76f25c9f6..073023cfad 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -164,7 +164,8 @@ public GapicClass generate(GapicContext context, Service service) { updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames); return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } private static List createClassAnnotations(Service service, TypeStore typeStore) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java index 08186862ae..fdfa33f471 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java @@ -127,7 +127,8 @@ public GapicClass generate(GapicContext context, Service service) { .setNestedClasses(Arrays.asList(createNestedBuilderClass(service, typeStore))) .build(); return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } private static List createClassHeaderComments( diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index cea124e96d..fe66a11e77 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -202,7 +202,8 @@ public GapicClass generate(GapicContext context, Service service) { .build(); return GapicClass.create( GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples)) - .withDefaultHost(service.defaultHost()); + .withApiShortName(service.apiShortName()) + .withApiVersion(service.apiVersion()); } protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() { diff --git a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java index 165cb4d94b..f05e308290 100644 --- a/src/main/java/com/google/api/generator/gapic/model/GapicClass.java +++ b/src/main/java/com/google/api/generator/gapic/model/GapicClass.java @@ -35,9 +35,11 @@ public enum Kind { public abstract List samples(); - // Represents the host URL for the service. May or may not contain a regional endpoint. Only used - // for generating the region tag for samples; therefore only used in select Composers. - public abstract String defaultHost(); + // Only used for generating the region tag for samples; therefore only used in select Composers. + public abstract String apiShortName(); + + // Only used for generating the region tag for samples; therefore only used in select Composers. + public abstract String apiVersion(); public static GapicClass create(Kind kind, ClassDefinition classDefinition) { return builder().setKind(kind).setClassDefinition(classDefinition).build(); @@ -51,7 +53,8 @@ public static GapicClass create( static Builder builder() { return new AutoValue_GapicClass.Builder() .setSamples(Collections.emptyList()) - .setDefaultHost(""); + .setApiShortName("") + .setApiVersion(""); } abstract Builder toBuilder(); @@ -60,8 +63,12 @@ public final GapicClass withSamples(List samples) { return toBuilder().setSamples(samples).build(); } - public final GapicClass withDefaultHost(String defaultHost) { - return toBuilder().setDefaultHost(defaultHost).build(); + public final GapicClass withApiShortName(String apiShortName) { + return toBuilder().setApiShortName(apiShortName).build(); + } + + public final GapicClass withApiVersion(String apiVersion) { + return toBuilder().setApiVersion(apiVersion).build(); } @AutoValue.Builder @@ -72,7 +79,9 @@ abstract static class Builder { abstract Builder setSamples(List samples); - abstract Builder setDefaultHost(String defaultHost); + abstract Builder setApiShortName(String apiShortName); + + abstract Builder setApiVersion(String apiVersion); abstract GapicClass build(); } diff --git a/src/main/java/com/google/api/generator/gapic/model/Service.java b/src/main/java/com/google/api/generator/gapic/model/Service.java index 34d3f97b25..2e3a6be7df 100644 --- a/src/main/java/com/google/api/generator/gapic/model/Service.java +++ b/src/main/java/com/google/api/generator/gapic/model/Service.java @@ -16,8 +16,10 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.auto.value.AutoValue; +import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import java.util.List; import javax.annotation.Nullable; @@ -50,6 +52,20 @@ public boolean hasDescription() { return !Strings.isNullOrEmpty(description()); } + public String apiShortName() { + if (!Strings.isNullOrEmpty(defaultHost())) { + return parseApiShortName(defaultHost()); + } + return ""; + } + + public String apiVersion() { + if (!Strings.isNullOrEmpty(protoPakkage())) { + return parseApiVersion(protoPakkage()); + } + return ""; + } + public Method operationPollingMethod() { for (Method method : methods()) { if (method.isOperationPollingMethod()) { @@ -127,4 +143,35 @@ public abstract static class Builder { public abstract Service build(); } + + private static String parseApiVersion(String protoPackage) { + // parse protoPackage for apiVersion + String[] pakkage = protoPackage.split("\\."); + String apiVersion; + // e.g. v1, v2, v1beta1 + if (pakkage[pakkage.length - 1].matches("v[0-9].*")) { + apiVersion = pakkage[pakkage.length - 1]; + } else { + apiVersion = ""; + } + return apiVersion; + } + + // Parse defaultHost for apiShortName for the RegionTag. Need to account for regional default + // endpoints like + // "us-east1-pubsub.googleapis.com". + private static String parseApiShortName(String defaultHost) { + // If the defaultHost is of the format "**.googleapis.com", take the name before the first + // period. + String apiShortName = Iterables.getFirst(Splitter.on(".").split(defaultHost), defaultHost); + // If the defaultHost is of the format "**-**-**.googleapis.com", take the section before the + // first period and after the last dash to follow CSharp's implementation here: + // https://github.com/googleapis/gapic-generator-csharp/blob/main/Google.Api.Generator/Generation/ServiceDetails.cs#L70 + apiShortName = Iterables.getLast(Splitter.on("-").split(apiShortName), defaultHost); + // `iam-meta-api` service is an exceptional case and is handled as a one-off + if (defaultHost.contains("iam-meta-api")) { + apiShortName = "iam"; + } + return apiShortName; + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java index caf070682c..d99325fbe8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java @@ -42,14 +42,16 @@ public class ComposerTest { private final Service echoProtoService = context.services().get(0); private final List clazzes = Arrays.asList( - GrpcServiceCallableFactoryClassComposer.instance().generate(context, echoProtoService)); + GrpcServiceCallableFactoryClassComposer.instance() + .generate(context, echoProtoService) + .withApiShortName(echoProtoService.apiShortName()) + .withApiVersion(echoProtoService.apiVersion())); private final Sample sample = Sample.builder() .setRegionTag( RegionTag.builder().setServiceName("serviceName").setRpcName("rpcName").build()) .build(); private List ListofSamples = Arrays.asList(new Sample[] {sample}); - private final String protoPackage = echoProtoService.protoPakkage(); @Test public void gapicClass_addApacheLicense() { @@ -75,7 +77,7 @@ public void composeSamples_showcase() { List testClassList = Arrays.asList(new GapicClass[] {testClass}); List composedSamples = - Composer.prepareExecutableSamples(testClassList, protoPackage).get(0).samples(); + Composer.prepareExecutableSamples(testClassList).get(0).samples(); assertFalse(composedSamples.isEmpty()); for (Sample sample : composedSamples) { @@ -83,39 +85,14 @@ public void composeSamples_showcase() { "File header should be APACHE", Arrays.asList(CommentComposer.APACHE_LICENSE_COMMENT), sample.fileHeader()); - assertEquals("ApiShortName should be empty", "", sample.regionTag().apiShortName()); - assertEquals("ApiVersion should be V1beta1", "V1Beta1", sample.regionTag().apiVersion()); + assertEquals( + "ApiShortName should be Localhost7469", + "Localhost7469", + sample.regionTag().apiShortName()); + assertEquals("ApiVersion should be V1Beta1", "V1Beta1", sample.regionTag().apiVersion()); } } - @Test - public void parseDefaultHost_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { - String defaultHost = "us-east1-pubsub.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("pubsub", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnApiShortName() { - String defaultHost = "logging.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("logging", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnApiShortNameForIam() { - String defaultHost = "iam-meta-api.googleapis.com"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("iam", apiShortName); - } - - @Test - public void parseDefaultHost_shouldReturnHostIfNoPeriods() { - String defaultHost = "logging:7469"; - String apiShortName = Composer.parseDefaultHost(defaultHost); - assertEquals("logging:7469", apiShortName); - } - @Test public void gapicClass_addRegionTagAndHeaderToSample() { Sample testSample; @@ -129,12 +106,12 @@ public void gapicClass_addRegionTagAndHeaderToSample() { public void composeSamples_parseProtoPackage() { String defaultHost = "accessapproval.googleapis.com:443"; - GapicClass testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); - List testClassList = Arrays.asList(new GapicClass[] {testClass}); String protoPack = "google.cloud.accessapproval.v1"; - + Service testService = + echoProtoService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + List testClassList = getTestClassListFromService(testService); List composedSamples = - Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -149,9 +126,10 @@ public void composeSamples_parseProtoPackage() { protoPack = "google.cloud.vision.v1p1beta1"; defaultHost = "vision.googleapis.com"; - testClass = clazzes.get(0).withSamples(ListofSamples).withDefaultHost(defaultHost); - testClassList = Arrays.asList(new GapicClass[] {testClass}); - composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + testService = + testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + testClassList = getTestClassListFromService(testService); + composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -161,7 +139,10 @@ public void composeSamples_parseProtoPackage() { } protoPack = "google.cloud.vision"; - composedSamples = Composer.prepareExecutableSamples(testClassList, protoPack).get(0).samples(); + testService = + testService.toBuilder().setDefaultHost(defaultHost).setProtoPakkage(protoPack).build(); + testClassList = getTestClassListFromService(testService); + composedSamples = Composer.prepareExecutableSamples(testClassList).get(0).samples(); // If samples is empty, the test automatically passes without checking. assertFalse(composedSamples.isEmpty()); @@ -170,4 +151,15 @@ public void composeSamples_parseProtoPackage() { assertEquals("ApiVersion should be empty", sample.regionTag().apiVersion(), ""); } } + + private List getTestClassListFromService(Service testService) { + GapicClass testClass = + GrpcServiceCallableFactoryClassComposer.instance() + .generate(context, testService) + .withSamples(ListofSamples) + .withApiShortName(testService.apiShortName()) + .withApiVersion(testService.apiVersion()); + List testClassList = Arrays.asList(new GapicClass[] {testClass}); + return testClassList; + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java index 18450c1ca8..c169c88eb3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java @@ -29,26 +29,35 @@ public class ServiceClientClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoClient", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "EchoClient", + GrpcTestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" + }, { "DeprecatedServiceClient", GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" }, { "IdentityClient", GrpcTestProtoLoader.instance().parseShowcaseIdentity(), - "localhost:7469" + "localhost:7469", + "v1beta1" }, { "BookshopClient", GrpcTestProtoLoader.instance().parseBookshopService(), - "localhost:2665" + "localhost:2665", + "v1beta1" }, { "MessagingClient", GrpcTestProtoLoader.instance().parseShowcaseMessaging(), - "localhost:7469" + "localhost:7469", + "v1beta1" }, }); } @@ -59,7 +68,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceClientClasses() { @@ -69,6 +81,7 @@ public void generateServiceClientClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertGoldenSamples( this.getClass(), name, clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java index 7f59ac58d0..1d245a7490 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java @@ -31,11 +31,17 @@ public class ServiceSettingsClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoSettings", TestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469"}, + { + "EchoSettings", + TestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" + }, { "DeprecatedServiceSettings", TestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" } }); } @@ -46,7 +52,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceSettingsClasses() { @@ -59,6 +68,7 @@ public void generateServiceSettingsClasses() { "servicesettings", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java index 0da8ac4548..730136c083 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java @@ -31,8 +31,8 @@ public class ServiceStubClassComposerTest { public static Collection data() { return Arrays.asList( new Object[][] { - {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), ""}, - {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), ""} + {"EchoStub", TestProtoLoader.instance().parseShowcaseEcho(), "", ""}, + {"DeprecatedServiceStub", TestProtoLoader.instance().parseDeprecatedService(), "", ""} }); } @@ -42,7 +42,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceStubClasses() { @@ -51,6 +54,7 @@ public void generateServiceStubClasses() { Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden"); Assert.assertEmptySamples(clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java index 019252dce3..747b19b8e0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java @@ -33,20 +33,26 @@ public static Collection data() { { "LoggingServiceV2StubSettings", GrpcTestProtoLoader.instance().parseLogging(), - "logging.googleapis.com:443" + "logging", + "v2" }, { "PublisherStubSettings", GrpcTestProtoLoader.instance().parsePubSubPublisher(), - "pubsub.googleapis.com:443" + "pubsub", + "v1" }, { - "EchoStubSettings", GrpcTestProtoLoader.instance().parseShowcaseEcho(), "localhost:7469" + "EchoStubSettings", + GrpcTestProtoLoader.instance().parseShowcaseEcho(), + "localhost:7469", + "v1beta1" }, { "DeprecatedServiceStubSettings", GrpcTestProtoLoader.instance().parseDeprecatedService(), - "localhost:7469" + "localhost:7469", + "v1" } }); } @@ -57,7 +63,10 @@ public static Collection data() { public GapicContext context; @Parameterized.Parameter(2) - public String defaultHostExpected; + public String apiShortNameExpected; + + @Parameterized.Parameter(3) + public String apiVersionExpected; @Test public void generateServiceStubSettingsClasses() { @@ -70,6 +79,7 @@ public void generateServiceStubSettingsClasses() { "servicesettings/stub", clazz.classDefinition().packageString(), clazz.samples()); - Assert.assertCodeEquals(clazz.defaultHost(), defaultHostExpected); + Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected); + Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected); } } diff --git a/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java b/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java new file mode 100644 index 0000000000..c6f60b831f --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/model/ServiceTest.java @@ -0,0 +1,75 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.api.generator.gapic.model; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import org.junit.Test; + +public class ServiceTest { + private static final String SHOWCASE_PACKAGE_NAME = "com.google.showcase.v1beta1"; + private static final Service.Builder testServiceBuilder = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo"); + + @Test + public void apiShortName_shouldReturnApiShortNameIfHostContainsRegionalEndpoint() { + String defaultHost = "us-east1-pubsub.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("pubsub", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnApiShortName() { + String defaultHost = "logging.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("logging", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnApiShortNameForIam() { + String defaultHost = "iam-meta-api.googleapis.com"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("iam", testService.apiShortName()); + } + + @Test + public void apiShortName_shouldReturnHostIfNoPeriods() { + String defaultHost = "logging:7469"; + Service testService = testServiceBuilder.setDefaultHost(defaultHost).build(); + assertEquals("logging:7469", testService.apiShortName()); + } + + @Test + public void apiVersion_shouldReturnVersionIfMatch() { + String protoPackage = "com.google.showcase.v1"; + Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); + assertEquals("v1", testService.apiVersion()); + } + + @Test + public void apiVersion_shouldReturnEmptyIfNoMatch() { + String protoPackage = "com.google.showcase"; + Service testService = testServiceBuilder.setProtoPakkage(protoPackage).build(); + assertEquals("", testService.apiVersion()); + } +} From 9ac0ca80b09077f7880f0029b5d7b090a10a10b8 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:19:21 -0700 Subject: [PATCH 3/5] fix: fix REST transport client creation generated javadoc sample (#1077) --- .../grpcrest/ServiceClientClassComposer.java | 2 +- .../ServiceClientHeaderSampleComposer.java | 21 +++---------------- .../grpcrest/goldens/EchoClient.golden | 6 +----- .../grpcrest/goldens/EchoEmpty.golden | 6 +----- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index e600ada5d2..5eb48fa06a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -59,7 +59,7 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); Sample transportSampleCode = ServiceClientHeaderSampleComposer.composeTransportSample( - clientType, settingsType, "defaultHttpJsonTransportProviderBuilder"); + clientType, settingsType, "newHttpJsonBuilder"); samples.addAll( Arrays.asList( classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode)); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index 2c00498e4f..11f70bcb27 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -285,7 +285,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett } public static Sample composeTransportSample( - TypeNode clientType, TypeNode settingsType, String transportProviderMethod) { + TypeNode clientType, TypeNode settingsType, String transportBuilderMethod) { String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = @@ -294,26 +294,11 @@ public static Sample composeTransportSample( MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() .setStaticReferenceType(settingsType) - .setMethodName("newBuilder") - .build(); - MethodInvocationExpr transportChannelProviderArg = - MethodInvocationExpr.builder() - .setExprReferenceExpr( - MethodInvocationExpr.builder() - .setStaticReferenceType(settingsType) - .setMethodName(transportProviderMethod) - .build()) - .setMethodName("build") - .build(); - MethodInvocationExpr credentialsMethodExpr = - MethodInvocationExpr.builder() - .setExprReferenceExpr(newBuilderMethodExpr) - .setArguments(transportChannelProviderArg) - .setMethodName("setTransportChannelProvider") + .setMethodName(transportBuilderMethod) .build(); MethodInvocationExpr buildMethodExpr = MethodInvocationExpr.builder() - .setExprReferenceExpr(credentialsMethodExpr) + .setExprReferenceExpr(newBuilderMethodExpr) .setReturnType(settingsType) .setMethodName("build") .build(); diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden index 5e38c6d146..15d3a77a29 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden @@ -105,11 +105,7 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoSettings echoSettings = - * EchoSettings.newBuilder() - * .setTransportChannelProvider( - * EchoSettings.defaultHttpJsonTransportProviderBuilder().build()) - * .build(); + * EchoSettings echoSettings = EchoSettings.newHttpJsonBuilder().build(); * EchoClient echoClient = EchoClient.create(echoSettings); * } * diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden index 0165872e80..d9708af4ae 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden @@ -85,11 +85,7 @@ import javax.annotation.Generated; * // - It may require correct/in-range values for request initialization. * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library - * EchoEmpySettings echoEmpySettings = - * EchoEmpySettings.newBuilder() - * .setTransportChannelProvider( - * EchoEmpySettings.defaultHttpJsonTransportProviderBuilder().build()) - * .build(); + * EchoEmpySettings echoEmpySettings = EchoEmpySettings.newHttpJsonBuilder().build(); * EchoEmpyClient echoEmpyClient = EchoEmpyClient.create(echoEmpySettings); * } * From bed9f721fbafb5f2e974b6f43f8455f2fdb581f7 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Tue, 1 Nov 2022 17:14:13 -0400 Subject: [PATCH 4/5] fix: fixes regionTag breakage (#1068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fixes regionTag breakage * update credentials integration test * removing getPureServiceName function * linter * refactor test * chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 (#1072) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-shade-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-shade-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java). * refactor: expose parsed api short name and version as fields in Service (#1075) * Exposes parsed apiShortName and apiVersion as fields in Service.java, since the source fields (defaultHost and protoPakkage) are both defined per-service. * Adds these two fields correspondingly to GapicClass so that it can be composed from Service given these two upstream fields, then replaces withDefaultHost (for building GapicClass) withApiShortName and withApiVersion. (Composers and tests where this is currently used for sample generation are updated) * This change will enable Spring Codegen (when eventually split out from this repo) to reuse this parsing logic in descriptive comments and metadata. It also moves the parsing logic to earlier in the parse-compose process. * fix: fix REST transport client creation generated javadoc sample (#1077) * fix: fixes regionTag breakage * remove errant comment Co-authored-by: WhiteSource Renovate Co-authored-by: Emily Wang Co-authored-by: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> --- .../AbstractServiceClientClassComposer.java | 39 ++- .../grpcrest/ServiceClientClassComposer.java | 8 +- ...iceClientCallableMethodSampleComposer.java | 66 +++-- .../ServiceClientHeaderSampleComposer.java | 40 +-- .../ServiceClientMethodSampleComposer.java | 40 +-- .../gapic/composer/utils/ClassNames.java | 9 - ...lientCallableMethodSampleComposerTest.java | 258 ++++++++++++++++-- ...ServiceClientHeaderSampleComposerTest.java | 109 +++++++- ...ServiceClientMethodSampleComposerTest.java | 80 +++++- .../gapic/composer/utils/ClassNamesTest.java | 31 --- .../AsyncCheckAndMutateRow.java | 4 +- .../SyncCheckAndMutateRow.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- ...ringRowfilterListmutationListmutation.java | 4 +- ...wfilterListmutationListmutationString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../mutaterow/AsyncMutateRow.java | 4 +- .../mutaterow/SyncMutateRow.java | 4 +- ...MutateRowStringBytestringListmutation.java | 4 +- ...RowStringBytestringListmutationString.java | 4 +- ...ateRowTablenameBytestringListmutation.java | 4 +- ...TablenameBytestringListmutationString.java | 4 +- .../mutaterows/AsyncMutateRows.java | 4 +- .../AsyncReadModifyWriteRow.java | 4 +- .../SyncReadModifyWriteRow.java | 4 +- ...ringBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- ...nameBytestringListreadmodifywriterule.java | 4 +- ...testringListreadmodifywriteruleString.java | 4 +- .../readrows/AsyncReadRows.java | 4 +- .../samplerowkeys/AsyncSampleRowKeys.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../AsyncGenerateAccessToken.java | 4 +- .../SyncGenerateAccessToken.java | 4 +- ...countnameListstringListstringDuration.java | 4 +- ...kenStringListstringListstringDuration.java | 4 +- .../generateidtoken/AsyncGenerateIdToken.java | 4 +- .../generateidtoken/SyncGenerateIdToken.java | 4 +- ...iceaccountnameListstringStringBoolean.java | 4 +- ...eIdTokenStringListstringStringBoolean.java | 4 +- .../signblob/AsyncSignBlob.java | 4 +- .../iamcredentials/signblob/SyncSignBlob.java | 4 +- ...erviceaccountnameListstringBytestring.java | 4 +- ...yncSignBlobStringListstringBytestring.java | 4 +- .../iamcredentials/signjwt/AsyncSignJwt.java | 4 +- .../iamcredentials/signjwt/SyncSignJwt.java | 4 +- ...JwtServiceaccountnameListstringString.java | 4 +- .../SyncSignJwtStringListstringString.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createbucket/AsyncCreateBucket.java | 4 +- .../createbucket/SyncCreateBucket.java | 4 +- .../createexclusion/AsyncCreateExclusion.java | 4 +- .../createexclusion/SyncCreateExclusion.java | 4 +- ...clusionBillingaccountnameLogexclusion.java | 4 +- ...CreateExclusionFoldernameLogexclusion.java | 4 +- ...ExclusionOrganizationnameLogexclusion.java | 4 +- ...reateExclusionProjectnameLogexclusion.java | 4 +- ...SyncCreateExclusionStringLogexclusion.java | 4 +- .../createsink/AsyncCreateSink.java | 4 +- .../createsink/SyncCreateSink.java | 4 +- ...ncCreateSinkBillingaccountnameLogsink.java | 4 +- .../SyncCreateSinkFoldernameLogsink.java | 4 +- ...SyncCreateSinkOrganizationnameLogsink.java | 4 +- .../SyncCreateSinkProjectnameLogsink.java | 4 +- .../SyncCreateSinkStringLogsink.java | 4 +- .../createview/AsyncCreateView.java | 4 +- .../createview/SyncCreateView.java | 4 +- .../deletebucket/AsyncDeleteBucket.java | 4 +- .../deletebucket/SyncDeleteBucket.java | 4 +- .../deleteexclusion/AsyncDeleteExclusion.java | 4 +- .../deleteexclusion/SyncDeleteExclusion.java | 4 +- .../SyncDeleteExclusionLogexclusionname.java | 4 +- .../SyncDeleteExclusionString.java | 4 +- .../deletesink/AsyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSink.java | 4 +- .../deletesink/SyncDeleteSinkLogsinkname.java | 4 +- .../deletesink/SyncDeleteSinkString.java | 4 +- .../deleteview/AsyncDeleteView.java | 4 +- .../deleteview/SyncDeleteView.java | 4 +- .../getbucket/AsyncGetBucket.java | 4 +- .../getbucket/SyncGetBucket.java | 4 +- .../getcmeksettings/AsyncGetCmekSettings.java | 4 +- .../getcmeksettings/SyncGetCmekSettings.java | 4 +- .../getexclusion/AsyncGetExclusion.java | 4 +- .../getexclusion/SyncGetExclusion.java | 4 +- .../SyncGetExclusionLogexclusionname.java | 4 +- .../getexclusion/SyncGetExclusionString.java | 4 +- .../getsink/AsyncGetSink.java | 4 +- .../getsink/SyncGetSink.java | 4 +- .../getsink/SyncGetSinkLogsinkname.java | 4 +- .../getsink/SyncGetSinkString.java | 4 +- .../getview/AsyncGetView.java | 4 +- .../getview/SyncGetView.java | 4 +- .../listbuckets/AsyncListBuckets.java | 4 +- .../listbuckets/AsyncListBucketsPaged.java | 4 +- .../listbuckets/SyncListBuckets.java | 4 +- ...ListBucketsBillingaccountlocationname.java | 4 +- .../SyncListBucketsFolderlocationname.java | 4 +- .../SyncListBucketsLocationname.java | 4 +- ...ncListBucketsOrganizationlocationname.java | 4 +- .../listbuckets/SyncListBucketsString.java | 4 +- .../listexclusions/AsyncListExclusions.java | 4 +- .../AsyncListExclusionsPaged.java | 4 +- .../listexclusions/SyncListExclusions.java | 4 +- .../SyncListExclusionsBillingaccountname.java | 4 +- .../SyncListExclusionsFoldername.java | 4 +- .../SyncListExclusionsOrganizationname.java | 4 +- .../SyncListExclusionsProjectname.java | 4 +- .../SyncListExclusionsString.java | 4 +- .../listsinks/AsyncListSinks.java | 4 +- .../listsinks/AsyncListSinksPaged.java | 4 +- .../listsinks/SyncListSinks.java | 4 +- .../SyncListSinksBillingaccountname.java | 4 +- .../listsinks/SyncListSinksFoldername.java | 4 +- .../SyncListSinksOrganizationname.java | 4 +- .../listsinks/SyncListSinksProjectname.java | 4 +- .../listsinks/SyncListSinksString.java | 4 +- .../listviews/AsyncListViews.java | 4 +- .../listviews/AsyncListViewsPaged.java | 4 +- .../listviews/SyncListViews.java | 4 +- .../listviews/SyncListViewsString.java | 4 +- .../undeletebucket/AsyncUndeleteBucket.java | 4 +- .../undeletebucket/SyncUndeleteBucket.java | 4 +- .../updatebucket/AsyncUpdateBucket.java | 4 +- .../updatebucket/SyncUpdateBucket.java | 4 +- .../AsyncUpdateCmekSettings.java | 4 +- .../SyncUpdateCmekSettings.java | 4 +- .../updateexclusion/AsyncUpdateExclusion.java | 4 +- .../updateexclusion/SyncUpdateExclusion.java | 4 +- ...LogexclusionnameLogexclusionFieldmask.java | 4 +- ...eExclusionStringLogexclusionFieldmask.java | 4 +- .../updatesink/AsyncUpdateSink.java | 4 +- .../updatesink/SyncUpdateSink.java | 4 +- .../SyncUpdateSinkLogsinknameLogsink.java | 4 +- ...UpdateSinkLogsinknameLogsinkFieldmask.java | 4 +- .../SyncUpdateSinkStringLogsink.java | 4 +- .../SyncUpdateSinkStringLogsinkFieldmask.java | 4 +- .../updateview/AsyncUpdateView.java | 4 +- .../updateview/SyncUpdateView.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../deletelog/AsyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLog.java | 4 +- .../deletelog/SyncDeleteLogLogname.java | 4 +- .../deletelog/SyncDeleteLogString.java | 4 +- .../listlogentries/AsyncListLogEntries.java | 4 +- .../AsyncListLogEntriesPaged.java | 4 +- .../listlogentries/SyncListLogEntries.java | 4 +- ...cListLogEntriesListstringStringString.java | 4 +- .../listlogs/AsyncListLogs.java | 4 +- .../listlogs/AsyncListLogsPaged.java | 4 +- .../listlogs/SyncListLogs.java | 4 +- .../SyncListLogsBillingaccountname.java | 4 +- .../listlogs/SyncListLogsFoldername.java | 4 +- .../SyncListLogsOrganizationname.java | 4 +- .../listlogs/SyncListLogsProjectname.java | 4 +- .../listlogs/SyncListLogsString.java | 4 +- ...AsyncListMonitoredResourceDescriptors.java | 4 +- ...ListMonitoredResourceDescriptorsPaged.java | 4 +- .../SyncListMonitoredResourceDescriptors.java | 4 +- .../taillogentries/AsyncTailLogEntries.java | 4 +- .../writelogentries/AsyncWriteLogEntries.java | 4 +- .../writelogentries/SyncWriteLogEntries.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- ...edresourceMapstringstringListlogentry.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createlogmetric/AsyncCreateLogMetric.java | 4 +- .../createlogmetric/SyncCreateLogMetric.java | 4 +- ...ncCreateLogMetricProjectnameLogmetric.java | 4 +- .../SyncCreateLogMetricStringLogmetric.java | 4 +- .../deletelogmetric/AsyncDeleteLogMetric.java | 4 +- .../deletelogmetric/SyncDeleteLogMetric.java | 4 +- .../SyncDeleteLogMetricLogmetricname.java | 4 +- .../SyncDeleteLogMetricString.java | 4 +- .../getlogmetric/AsyncGetLogMetric.java | 4 +- .../getlogmetric/SyncGetLogMetric.java | 4 +- .../SyncGetLogMetricLogmetricname.java | 4 +- .../getlogmetric/SyncGetLogMetricString.java | 4 +- .../listlogmetrics/AsyncListLogMetrics.java | 4 +- .../AsyncListLogMetricsPaged.java | 4 +- .../listlogmetrics/SyncListLogMetrics.java | 4 +- .../SyncListLogMetricsProjectname.java | 4 +- .../SyncListLogMetricsString.java | 4 +- .../updatelogmetric/AsyncUpdateLogMetric.java | 4 +- .../updatelogmetric/SyncUpdateLogMetric.java | 4 +- ...UpdateLogMetricLogmetricnameLogmetric.java | 4 +- .../SyncUpdateLogMetricStringLogmetric.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createtopic/AsyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopic.java | 4 +- .../createtopic/SyncCreateTopicString.java | 4 +- .../createtopic/SyncCreateTopicTopicname.java | 4 +- .../deletetopic/AsyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopic.java | 4 +- .../deletetopic/SyncDeleteTopicString.java | 4 +- .../deletetopic/SyncDeleteTopicTopicname.java | 4 +- .../AsyncDetachSubscription.java | 4 +- .../SyncDetachSubscription.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../gettopic/AsyncGetTopic.java | 4 +- .../gettopic/SyncGetTopic.java | 4 +- .../gettopic/SyncGetTopicString.java | 4 +- .../gettopic/SyncGetTopicTopicname.java | 4 +- .../listtopics/AsyncListTopics.java | 4 +- .../listtopics/AsyncListTopicsPaged.java | 4 +- .../listtopics/SyncListTopics.java | 4 +- .../listtopics/SyncListTopicsProjectname.java | 4 +- .../listtopics/SyncListTopicsString.java | 4 +- .../AsyncListTopicSnapshots.java | 4 +- .../AsyncListTopicSnapshotsPaged.java | 4 +- .../SyncListTopicSnapshots.java | 4 +- .../SyncListTopicSnapshotsString.java | 4 +- .../SyncListTopicSnapshotsTopicname.java | 4 +- .../AsyncListTopicSubscriptions.java | 4 +- .../AsyncListTopicSubscriptionsPaged.java | 4 +- .../SyncListTopicSubscriptions.java | 4 +- .../SyncListTopicSubscriptionsString.java | 4 +- .../SyncListTopicSubscriptionsTopicname.java | 4 +- .../publish/AsyncPublish.java | 4 +- .../publish/SyncPublish.java | 4 +- .../SyncPublishStringListpubsubmessage.java | 4 +- ...SyncPublishTopicnameListpubsubmessage.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatetopic/AsyncUpdateTopic.java | 4 +- .../updatetopic/SyncUpdateTopic.java | 4 +- .../acknowledge/AsyncAcknowledge.java | 4 +- .../acknowledge/SyncAcknowledge.java | 4 +- .../SyncAcknowledgeStringListstring.java | 4 +- ...AcknowledgeSubscriptionnameListstring.java | 4 +- .../SyncCreateSetCredentialsProvider.java | 4 +- .../create/SyncCreateSetEndpoint.java | 4 +- .../createsnapshot/AsyncCreateSnapshot.java | 4 +- .../createsnapshot/SyncCreateSnapshot.java | 4 +- .../SyncCreateSnapshotSnapshotnameString.java | 4 +- ...eSnapshotSnapshotnameSubscriptionname.java | 4 +- .../SyncCreateSnapshotStringString.java | 4 +- ...cCreateSnapshotStringSubscriptionname.java | 4 +- .../AsyncCreateSubscription.java | 4 +- .../SyncCreateSubscription.java | 4 +- ...SubscriptionStringStringPushconfigInt.java | 4 +- ...scriptionStringTopicnamePushconfigInt.java | 4 +- ...onSubscriptionnameStringPushconfigInt.java | 4 +- ...ubscriptionnameTopicnamePushconfigInt.java | 4 +- .../deletesnapshot/AsyncDeleteSnapshot.java | 4 +- .../deletesnapshot/SyncDeleteSnapshot.java | 4 +- .../SyncDeleteSnapshotSnapshotname.java | 4 +- .../SyncDeleteSnapshotString.java | 4 +- .../AsyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscription.java | 4 +- .../SyncDeleteSubscriptionString.java | 4 +- ...yncDeleteSubscriptionSubscriptionname.java | 4 +- .../getiampolicy/AsyncGetIamPolicy.java | 4 +- .../getiampolicy/SyncGetIamPolicy.java | 4 +- .../getsnapshot/AsyncGetSnapshot.java | 4 +- .../getsnapshot/SyncGetSnapshot.java | 4 +- .../SyncGetSnapshotSnapshotname.java | 4 +- .../getsnapshot/SyncGetSnapshotString.java | 4 +- .../getsubscription/AsyncGetSubscription.java | 4 +- .../getsubscription/SyncGetSubscription.java | 4 +- .../SyncGetSubscriptionString.java | 4 +- .../SyncGetSubscriptionSubscriptionname.java | 4 +- .../listsnapshots/AsyncListSnapshots.java | 4 +- .../AsyncListSnapshotsPaged.java | 4 +- .../listsnapshots/SyncListSnapshots.java | 4 +- .../SyncListSnapshotsProjectname.java | 4 +- .../SyncListSnapshotsString.java | 4 +- .../AsyncListSubscriptions.java | 4 +- .../AsyncListSubscriptionsPaged.java | 4 +- .../SyncListSubscriptions.java | 4 +- .../SyncListSubscriptionsProjectname.java | 4 +- .../SyncListSubscriptionsString.java | 4 +- .../AsyncModifyAckDeadline.java | 4 +- .../SyncModifyAckDeadline.java | 4 +- ...cModifyAckDeadlineStringListstringInt.java | 4 +- ...DeadlineSubscriptionnameListstringInt.java | 4 +- .../AsyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfig.java | 4 +- .../SyncModifyPushConfigStringPushconfig.java | 4 +- ...yPushConfigSubscriptionnamePushconfig.java | 4 +- .../pull/AsyncPull.java | 4 +- .../pull/SyncPull.java | 4 +- .../pull/SyncPullStringBooleanInt.java | 4 +- .../pull/SyncPullStringInt.java | 4 +- .../SyncPullSubscriptionnameBooleanInt.java | 4 +- .../pull/SyncPullSubscriptionnameInt.java | 4 +- .../seek/AsyncSeek.java | 4 +- .../seek/SyncSeek.java | 4 +- .../setiampolicy/AsyncSetIamPolicy.java | 4 +- .../setiampolicy/SyncSetIamPolicy.java | 4 +- .../streamingpull/AsyncStreamingPull.java | 4 +- .../AsyncTestIamPermissions.java | 4 +- .../SyncTestIamPermissions.java | 4 +- .../updatesnapshot/AsyncUpdateSnapshot.java | 4 +- .../updatesnapshot/SyncUpdateSnapshot.java | 4 +- .../AsyncUpdateSubscription.java | 4 +- .../SyncUpdateSubscription.java | 4 +- 306 files changed, 1118 insertions(+), 746 deletions(-) delete mode 100644 src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/AsyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/AsyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowStringBytestringListmutation.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowStringBytestringListmutationString.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowTablenameBytestringListmutation.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java (91%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/mutaterows/AsyncMutateRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/AsyncReadModifyWriteRow.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRow.java (93%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java (90%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java (89%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/readrows/AsyncReadRows.java (94%) rename test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/{basebigtabledata => bigtable}/samplerowkeys/AsyncSampleRowKeys.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createbucket/AsyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createbucket/SyncCreateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/AsyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createexclusion/SyncCreateExclusionStringLogexclusion.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/AsyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkBillingaccountnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkFoldernameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkOrganizationnameLogsink.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkProjectnameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createsink/SyncCreateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createview/AsyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/createview/SyncCreateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletebucket/AsyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletebucket/SyncDeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/AsyncDeleteExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusion.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusionLogexclusionname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteexclusion/SyncDeleteExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/AsyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deletesink/SyncDeleteSinkString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteview/AsyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/deleteview/SyncDeleteView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getbucket/AsyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getbucket/SyncGetBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getcmeksettings/AsyncGetCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getcmeksettings/SyncGetCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/AsyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusionLogexclusionname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getexclusion/SyncGetExclusionString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/AsyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSinkLogsinkname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getsink/SyncGetSinkString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getview/AsyncGetView.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/getview/SyncGetView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/AsyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/AsyncListBucketsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBuckets.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsBillingaccountlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsFolderlocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsLocationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsOrganizationlocationname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listbuckets/SyncListBucketsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/AsyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/AsyncListExclusionsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusions.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsBillingaccountname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listexclusions/SyncListExclusionsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/AsyncListSinks.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/AsyncListSinksPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinks.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listsinks/SyncListSinksString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/AsyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/AsyncListViewsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/SyncListViews.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/listviews/SyncListViewsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/undeletebucket/AsyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/undeletebucket/SyncUndeleteBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatebucket/AsyncUpdateBucket.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatebucket/SyncUpdateBucket.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatecmeksettings/AsyncUpdateCmekSettings.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatecmeksettings/SyncUpdateCmekSettings.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/AsyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusion.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/AsyncUpdateSink.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSink.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkLogsinknameLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkStringLogsink.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateview/AsyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{config => configservicev2}/updateview/SyncUpdateView.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/AsyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLog.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLogLogname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/deletelog/SyncDeleteLogString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/AsyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/AsyncListLogEntriesPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/SyncListLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogentries/SyncListLogEntriesListstringStringString.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/AsyncListLogs.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/AsyncListLogsPaged.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogs.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsBillingaccountname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsFoldername.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsOrganizationname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listlogs/SyncListLogsString.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/taillogentries/AsyncTailLogEntries.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/AsyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntries.java (94%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java (89%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{logging => loggingservicev2}/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/create/SyncCreateSetEndpoint.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/AsyncCreateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/createlogmetric/SyncCreateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/AsyncDeleteLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetricLogmetricname.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/deletelogmetric/SyncDeleteLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/AsyncGetLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetricLogmetricname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/getlogmetric/SyncGetLogMetricString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/AsyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/AsyncListLogMetricsPaged.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetrics.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetricsProjectname.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/listlogmetrics/SyncListLogMetricsString.java (91%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/AsyncUpdateLogMetric.java (93%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetric.java (92%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java (90%) rename test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/{metrics => metricsservicev2}/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/create/SyncCreateSetCredentialsProvider.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/AsyncCreateTopic.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/createtopic/SyncCreateTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/AsyncDeleteTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/deletetopic/SyncDeleteTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/detachsubscription/AsyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/detachsubscription/SyncDetachSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/getiampolicy/AsyncGetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/getiampolicy/SyncGetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/AsyncGetTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopicString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/gettopic/SyncGetTopicTopicname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/AsyncListTopics.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/AsyncListTopicsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopics.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopicsProjectname.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopics/SyncListTopicsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/AsyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshotsString.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/AsyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/AsyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublish.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublishStringListpubsubmessage.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/publish/SyncPublishTopicnameListpubsubmessage.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/setiampolicy/AsyncSetIamPolicy.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/testiampermissions/AsyncTestIamPermissions.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/updatetopic/AsyncUpdateTopic.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{topicadmin => publisher}/updatetopic/SyncUpdateTopic.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/AsyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledge.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledgeStringListstring.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/create/SyncCreateSetCredentialsProvider.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/create/SyncCreateSetEndpoint.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/AsyncCreateSnapshot.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotSnapshotnameString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotStringString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/AsyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscription.java (95%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/AsyncDeleteSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshot.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshotSnapshotname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesnapshot/SyncDeleteSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/AsyncDeleteSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscription.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getiampolicy/AsyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getiampolicy/SyncGetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/AsyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshotSnapshotname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsnapshot/SyncGetSnapshotString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/AsyncGetSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscriptionString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/getsubscription/SyncGetSubscriptionSubscriptionname.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/AsyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/AsyncListSnapshotsPaged.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshots.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshotsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsnapshots/SyncListSnapshotsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/AsyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/AsyncListSubscriptionsPaged.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptionsProjectname.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/listsubscriptions/SyncListSubscriptionsString.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/AsyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadline.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/AsyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfig.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfigStringPushconfig.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java (90%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/AsyncPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullStringBooleanInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullStringInt.java (92%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullSubscriptionnameBooleanInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/pull/SyncPullSubscriptionnameInt.java (91%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/seek/AsyncSeek.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/seek/SyncSeek.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/setiampolicy/AsyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/setiampolicy/SyncSetIamPolicy.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/streamingpull/AsyncStreamingPull.java (94%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/testiampermissions/AsyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/testiampermissions/SyncTestIamPermissions.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesnapshot/AsyncUpdateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesnapshot/SyncUpdateSnapshot.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesubscription/AsyncUpdateSubscription.java (93%) rename test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/{subscriptionadmin => subscriber}/updatesubscription/SyncUpdateSubscription.java (92%) diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 073023cfad..b6095be08b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -200,9 +200,11 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample( + clientType, settingsType, service); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, service); samples.addAll(Arrays.asList(classMethodSampleCode, credentialsSampleCode, endpointSampleCode)); return ServiceClientCommentComposer.createClassHeaderComments( service, @@ -580,7 +582,8 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples); + samples, + service); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata @@ -598,7 +601,8 @@ private static List createServiceMethods( messageTypes, typeStore, resourceNames, - samples); + samples, + service); // Collect data for gapic_metadata.json. grpcRpcToJavaMethodMetadata.get(method.name()).add(javaMethodNameFn.apply(generatedMethod)); @@ -638,7 +642,8 @@ private static List createMethodVariants( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples) { + List samples, + Service service) { List javaMethods = new ArrayList<>(); String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); @@ -702,7 +707,12 @@ private static List createMethodVariants( Optional methodSample = Optional.of( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, typeStore.get(clientName), signature, resourceNames, messageTypes)); + method, + typeStore.get(clientName), + signature, + resourceNames, + messageTypes, + service)); Optional methodDocSample = Optional.empty(); if (methodSample.isPresent()) { samples.add(methodSample.get()); @@ -746,7 +756,8 @@ private static MethodDefinition createMethodDefaultMethod( Map messageTypes, TypeStore typeStore, Map resourceNames, - List samples) { + List samples, + Service service) { String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); TypeNode methodOutputType = @@ -790,7 +801,7 @@ private static MethodDefinition createMethodDefaultMethod( Optional defaultMethodSample = Optional.of( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, typeStore.get(clientName), resourceNames, messageTypes)); + method, typeStore.get(clientName), resourceNames, messageTypes, service)); Optional defaultMethodDocSample = Optional.empty(); if (defaultMethodSample.isPresent()) { samples.add(defaultMethodSample.get()); @@ -932,7 +943,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else if (callableMethodKind.equals(CallableMethodKind.PAGED)) { sampleCode = Optional.of( @@ -940,7 +952,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else if (callableMethodKind.equals(CallableMethodKind.REGULAR)) { if (method.stream().equals(Stream.NONE)) { sampleCode = @@ -949,7 +962,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } else { sampleCode = Optional.of( @@ -957,7 +971,8 @@ private static MethodDefinition createCallableMethod( method, typeStore.get(ClassNames.getServiceClientClassName(service)), resourceNames, - messageTypes)); + messageTypes, + service)); } } Optional sampleDocCode = Optional.empty(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index 5eb48fa06a..8933b7b4ed 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -54,12 +54,14 @@ protected List createClassHeaderComments( ServiceClientHeaderSampleComposer.composeClassHeaderSample( service, clientType, resourceNames, messageTypes); Sample credentialsSampleCode = - ServiceClientHeaderSampleComposer.composeSetCredentialsSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetCredentialsSample( + clientType, settingsType, service); Sample endpointSampleCode = - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, service); Sample transportSampleCode = ServiceClientHeaderSampleComposer.composeTransportSample( - clientType, settingsType, "newHttpJsonBuilder"); + clientType, settingsType, "newHttpJsonBuilder", service); samples.addAll( Arrays.asList( classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode)); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java index 07bdcd29a7..342fab52ad 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java @@ -42,13 +42,13 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.ast.WhileStatement; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -61,7 +61,7 @@ public class ServiceClientCallableMethodSampleComposer { private static Sample composeUnaryOrLroCallableSample( - Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr) { + Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, Service service) { List bodyStatements = new ArrayList<>(); // Create api future variable expression, and assign it with a value by invoking callable // method. @@ -125,8 +125,7 @@ private static Sample composeUnaryOrLroCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -141,7 +140,8 @@ private static Sample composePagedCallableSample( Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, - Map messageTypes) { + Map messageTypes, + Service service) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); Field repeatedPagedResultsField = methodOutputMessage.findAndUnwrapPaginatedRepeatedField(); @@ -280,8 +280,7 @@ private static Sample composePagedCallableSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation("Paged") .setIsAsynchronous(true) @@ -297,7 +296,8 @@ public static Sample composeLroCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -397,7 +397,7 @@ public static Sample composeLroCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .setOverloadDisambiguation("LRO") @@ -418,7 +418,8 @@ public static Sample composePagedCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -534,7 +535,7 @@ public static Sample composePagedCallableMethod( RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientType.reference().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -546,7 +547,8 @@ public static Sample composeRegularCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -578,13 +580,13 @@ public static Sample composeRegularCallableMethod( RegionTag regionTag; if (method.isPaged()) { Sample pagedCallable = - composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes); + composePagedCallableSample(method, clientVarExpr, requestVarExpr, messageTypes, service); bodyStatements.addAll(pagedCallable.body()); regionTag = pagedCallable.regionTag(); } else { // e.g. echoClient.echoCallable().futureCall(request) Sample unaryOrLroCallable = - composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr); + composeUnaryOrLroCallableSample(method, clientVarExpr, requestVarExpr, service); bodyStatements.addAll(unaryOrLroCallable.body()); regionTag = unaryOrLroCallable.regionTag(); } @@ -604,7 +606,8 @@ public static Sample composeStreamCallableMethod( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -633,16 +636,19 @@ public static Sample composeStreamCallableMethod( List bodyStatements = new ArrayList<>(); if (method.stream().equals(Method.Stream.SERVER)) { // e.g. ServerStream stream = echoClient.expandCallable().call(request); - Sample streamServer = composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamServer = + composeStreamServerSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamServer.body()); regionTag = streamServer.regionTag(); } else if (method.stream().equals(Method.Stream.BIDI)) { // e.g. echoClient.collect().clientStreamingCall(responseObserver); - Sample streamBidi = composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamBidi = + composeStreamBidiSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamBidi.body()); regionTag = streamBidi.regionTag(); } else if (method.stream().equals(Method.Stream.CLIENT)) { - Sample streamClient = composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr); + Sample streamClient = + composeStreamClientSample(method, clientVarExpr, requestAssignmentExpr, service); bodyStatements.addAll(streamClient.body()); regionTag = streamClient.regionTag(); } @@ -659,7 +665,10 @@ public static Sample composeStreamCallableMethod( } private static Sample composeStreamServerSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); bodyExprs.add(requestAssignmentExpr); @@ -720,8 +729,7 @@ private static Sample composeStreamServerSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -729,7 +737,10 @@ private static Sample composeStreamServerSample( } private static Sample composeStreamBidiSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); // Create bidi stream variable expression and assign it with invoking client's bidi stream @@ -800,8 +811,7 @@ private static Sample composeStreamBidiSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); @@ -809,7 +819,10 @@ private static Sample composeStreamBidiSample( } private static Sample composeStreamClientSample( - Method method, VariableExpr clientVarExpr, AssignmentExpr requestAssignmentExpr) { + Method method, + VariableExpr clientVarExpr, + AssignmentExpr requestAssignmentExpr, + Service service) { List bodyExprs = new ArrayList<>(); // Create responseObserver variable expression. @@ -933,8 +946,7 @@ private static Sample composeStreamClientSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setIsAsynchronous(true) .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index 11f70bcb27..b979f87744 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -27,7 +27,6 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.HttpBindings; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; @@ -54,7 +53,7 @@ public static Sample composeClassHeaderSample( Map resourceNames, Map messageTypes) { if (service.methods().isEmpty()) { - return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType); + return ServiceClientMethodSampleComposer.composeEmptyServiceSample(clientType, service); } // Use the first pure unary RPC method's sample code as showcase, if no such method exists, use @@ -68,13 +67,18 @@ public static Sample composeClassHeaderSample( if (method.stream() == Method.Stream.NONE) { if (method.methodSignatures().isEmpty()) { return ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes); + method, clientType, resourceNames, messageTypes, service); } return composeShowcaseMethodSample( - method, clientType, method.methodSignatures().get(0), resourceNames, messageTypes); + method, + clientType, + method.methodSignatures().get(0), + resourceNames, + messageTypes, + service); } return ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes); + method, clientType, resourceNames, messageTypes, service); } public static Sample composeShowcaseMethodSample( @@ -82,7 +86,8 @@ public static Sample composeShowcaseMethodSample( TypeNode clientType, List arguments, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -106,20 +111,20 @@ public static Sample composeShowcaseMethodSample( if (method.isPaged()) { Sample unaryPagedRpc = ServiceClientMethodSampleComposer.composePagedSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { Sample unaryLroRpc = ServiceClientMethodSampleComposer.composeLroSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(), echoClient.echo(...) Sample unaryRpc = ServiceClientMethodSampleComposer.composeSample( - method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -135,7 +140,8 @@ public static Sample composeShowcaseMethodSample( return Sample.builder().setBody(body).setRegionTag(regionTag).build(); } - public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode settingsType) { + public static Sample composeSetCredentialsSample( + TypeNode clientType, TypeNode settingsType, Service service) { // Initialize clientSettings with builder() method. // e.g. EchoSettings echoSettings = // EchoSettings.newBuilder().setCredentialsProvider(FixedCredentialsProvider.create("myCredentials")).build(); @@ -207,14 +213,16 @@ public static Sample composeSetCredentialsSample(TypeNode clientType, TypeNode s ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); - return Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); + Sample sample = Sample.builder().setBody(sampleBody).setRegionTag(regionTag).build(); + return sample.withRegionTag(sample.regionTag()); } - public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode settingsType) { + public static Sample composeSetEndpointSample( + TypeNode clientType, TypeNode settingsType, Service service) { // Initialize client settings with builder() method. // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build(); String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); @@ -274,7 +282,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett .build(); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setEndpoint") .build(); @@ -285,7 +293,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett } public static Sample composeTransportSample( - TypeNode clientType, TypeNode settingsType, String transportBuilderMethod) { + TypeNode clientType, TypeNode settingsType, String transportBuilderMethod, Service service) { String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = @@ -332,7 +340,7 @@ public static Sample composeTransportSample( ExprStatement.withExpr(initSettingsVarExpr), ExprStatement.withExpr(initClientVarExpr)); RegionTag regionTag = RegionTag.builder() - .setServiceName(ClassNames.getPureServiceName(clientName)) + .setServiceName(service.name()) .setRpcName(rpcName) .setOverloadDisambiguation("setCredentialsProvider") .build(); diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java index 5a45173595..311ebab5ac 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java @@ -27,13 +27,13 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; -import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.RegionTag; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -46,7 +46,7 @@ public class ServiceClientMethodSampleComposer { // Creates an example for an empty service (no API methods), which is a corner case but can // happen. Generated example will only show how to instantiate the client class but will not call // any API methods (because there are no API methods). - public static Sample composeEmptyServiceSample(TypeNode clientType) { + public static Sample composeEmptyServiceSample(TypeNode clientType, Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -57,11 +57,7 @@ public static Sample composeEmptyServiceSample(TypeNode clientType) { List bodyStatements = new ArrayList<>(); RegionTag regionTag = - RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) - .setRpcName("emtpy") - .build(); + RegionTag.builder().setServiceName(service.name()).setRpcName("emtpy").build(); List body = Arrays.asList( @@ -78,7 +74,8 @@ public static Sample composeCanonicalSample( Method method, TypeNode clientType, Map resourceNames, - Map messageTypes) { + Map messageTypes, + Service service) { VariableExpr clientVarExpr = VariableExpr.withVariable( Variable.builder() @@ -113,16 +110,19 @@ public static Sample composeCanonicalSample( if (method.isPaged()) { // e.g. echoClient.pagedExpand(request).iterateAll() Sample unaryPagedRpc = - composePagedSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes); + composePagedSample( + method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, messageTypes, service); bodyStatements.addAll(unaryPagedRpc.body()); regionTag = unaryPagedRpc.regionTag(); } else if (method.hasLro()) { - Sample unaryLroRpc = composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + Sample unaryLroRpc = + composeLroSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryLroRpc.body()); regionTag = unaryLroRpc.regionTag(); } else { // e.g. echoClient.echo(request) - Sample unaryRpc = composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs); + Sample unaryRpc = + composeSample(method, clientVarExpr, rpcMethodArgVarExprs, bodyExprs, service); bodyStatements.addAll(unaryRpc.body()); regionTag = unaryRpc.regionTag(); } @@ -142,7 +142,8 @@ static Sample composeSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs) { + List bodyExprs, + Service service) { // Invoke current method based on return type. // e.g. if return void, echoClient.echo(..); or, @@ -171,8 +172,7 @@ static Sample composeSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -189,7 +189,8 @@ static Sample composePagedSample( VariableExpr clientVarExpr, List rpcMethodArgVarExprs, List bodyExprs, - Map messageTypes) { + Map messageTypes, + Service service) { // Find the repeated field. Message methodOutputMessage = messageTypes.get(method.outputType().reference().fullName()); @@ -246,8 +247,7 @@ static Sample composePagedSample( RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) @@ -259,7 +259,8 @@ static Sample composeLroSample( Method method, VariableExpr clientVarExpr, List rpcMethodArgVarExprs, - List bodyExprs) { + List bodyExprs, + Service service) { // Assign response variable with invoking client's LRO method. // e.g. if return void, echoClient.waitAsync(ttl).get(); or, // e.g. if return other type, WaitResponse response = echoClient.waitAsync(ttl).get(); @@ -297,8 +298,7 @@ static Sample composeLroSample( } RegionTag regionTag = RegionTag.builder() - .setServiceName( - ClassNames.getPureServiceName(clientVarExpr.variable().identifier().name())) + .setServiceName(service.name()) .setRpcName(method.name()) .setOverloadDisambiguation( SampleComposerUtil.createOverloadDisambiguation(rpcMethodArgVarExprs)) diff --git a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java index 9d3a93162b..1228e5d166 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java +++ b/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java @@ -15,8 +15,6 @@ package com.google.api.generator.gapic.composer.utils; import com.google.api.generator.gapic.model.Service; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -123,11 +121,4 @@ private static String monolithBackwardsCompatibleName(String rawServiceName) { ? rawServiceName.replace("IAM", "Iam") : rawServiceName; } - - // For region tags, the service name should not include `Client` in the name - public static String getPureServiceName(String serviceClassName) { - return String.format( - "%s", - Iterables.getFirst(Splitter.on(CLIENT_SUFFIX).split(serviceClassName), serviceClassName)); - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java index 2199c2f49d..3edd5936de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposerTest.java @@ -22,6 +22,7 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors; @@ -37,6 +38,16 @@ public class ServiceClientCallableMethodSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; + private static final Service BasicService = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .build(); /*Testing composeLroCallableMethod*/ @Test @@ -83,10 +94,21 @@ public void valid_composeLroCallableMethod_withReturnResponse() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -140,10 +162,21 @@ public void valid_composeLroCallableMethod_withReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeLroCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -187,10 +220,21 @@ public void valid_composePagedCallableMethod() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -240,11 +284,22 @@ public void invalid_composePagedCallableMethod_inputTypeNotExistInMessage() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -277,11 +332,22 @@ public void invalid_composePagedCallableMethod_noExistMethodResponse() { .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -328,11 +394,22 @@ public void invalid_composePagedCallableMethod_noRepeatedResponse() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composePagedCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } /*Testing composeStreamCallableMethod*/ @@ -366,10 +443,21 @@ public void valid_composeStreamCallableMethod_serverStream() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -413,11 +501,22 @@ public void invalid_composeStreamCallableMethod_serverStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.SERVER) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -450,10 +549,21 @@ public void valid_composeStreamCallableMethod_bidiStream() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -506,11 +616,22 @@ public void invalid_composeStreamCallableMethod_bidiStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.BIDI) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -543,10 +664,21 @@ public void valid_composeStreamCallableMethod_clientStream() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -613,11 +745,22 @@ public void invalid_composeStreamCallableMethod_clientStreamNotExistRequest() { .setOutputType(outputType) .setStream(Method.Stream.CLIENT) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeStreamCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } /*Testing composeRegularCallableMethod*/ @@ -646,10 +789,21 @@ public void valid_composeRegularCallableMethod_unaryRpc() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -713,10 +867,21 @@ public void valid_composeRegularCallableMethod_lroRpc() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -769,10 +934,21 @@ public void valid_composeRegularCallableMethod_lroRpcWithReturnVoid() { .setOutputType(outputType) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -815,10 +991,21 @@ public void valid_composeRegularCallableMethod_pageRpc() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -869,11 +1056,22 @@ public void invalid_composeRegularCallableMethod_noExistMethodRequest() { .build()); Method method = Method.builder().setName("Echo").setInputType(inputType).setOutputType(outputType).build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -906,11 +1104,22 @@ public void invalid_composeRegularCallableMethod_noExistMethodResponsePagedRpc() .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -957,11 +1166,22 @@ public void invalid_composeRegularCallableMethod_noRepeatedResponsePagedRpc() { .setFields(Arrays.asList(responseField)) .build(); messageTypes.put("NoRepeatedResponse", noRepeatedResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientCallableMethodSampleComposer.composeRegularCallableMethod( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } private String writeStatements(Sample sample) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java index 32ab486356..64593d0fea 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposerTest.java @@ -45,6 +45,16 @@ public class ServiceClientHeaderSampleComposerTest { private static final String LRO_PACKAGE_NAME = "com.google.longrunning"; private static final String PROTO_PACKAGE_NAME = "com.google.protobuf"; private static final String PAGINATED_FIELD_NAME = "page_size"; + private static final Service TEST_SERVICE = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .build(); /*Testing composeClassHeaderSample*/ @Test @@ -297,7 +307,7 @@ public void composeSetCredentialsSample() { String results = writeStatements( ServiceClientHeaderSampleComposer.composeSetCredentialsSample( - clientType, settingsType)); + clientType, settingsType, TEST_SERVICE)); String expected = LineFormatter.lines( "EchoSettings echoSettings =\n", @@ -325,7 +335,8 @@ public void composeSetEndpointSample() { .build()); String results = writeStatements( - ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType)); + ServiceClientHeaderSampleComposer.composeSetEndpointSample( + clientType, settingsType, TEST_SERVICE)); String expected = LineFormatter.lines( "EchoSettings echoSettings =" @@ -340,6 +351,7 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument Descriptors.FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor(); Map resourceNames = Parser.parseResourceNames(echoFileDescriptor); Map messageTypes = Parser.parseMessages(echoFileDescriptor); + TypeNode clientType = TypeNode.withReference( VaporReference.builder() @@ -413,11 +425,22 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithMultipleMethodArgument .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -487,11 +510,22 @@ public void valid_composeShowcaseMethodSample_pagedRpcWithNoMethodArguments() { .setFields(Arrays.asList(repeatedField, nextPagedTokenField)) .build(); messageTypes.put("com.google.showcase.v1beta1.ListContentResponse", listContentResponseMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -534,11 +568,22 @@ public void invalid_composeShowcaseMethodSample_noMatchedRepeatedResponseTypeInP .setOutputType(outputType) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes)); + method, clientType, methodArguments, resourceNames, messageTypes, service)); } @Test @@ -595,11 +640,22 @@ public void invalid_composeShowcaseMethodSample_noRepeatedResponseTypeInPagedMet .setFields(Arrays.asList(responseField, nextPageToken)) .build(); messageTypes.put("PagedResponse", noRepeatedFieldMessage); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, methodArguments, resourceNames, messageTypes)); + method, clientType, methodArguments, resourceNames, messageTypes, service)); } @Test @@ -647,11 +703,21 @@ public void valid_composeShowcaseMethodSample_lroUnaryRpcWithNoMethodArgument() .setLro(lro) .setMethodSignatures(Collections.emptyList()) .build(); - + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, Collections.emptyList(), resourceNames, messageTypes)); + method, clientType, Collections.emptyList(), resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -722,10 +788,21 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnResponseType() { .setMethodSignatures(Arrays.asList(arguments)) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -793,11 +870,21 @@ public void valid_composeShowcaseMethodSample_lroRpcWithReturnVoid() { .setLro(lro) .setMethodSignatures(Arrays.asList(arguments)) .build(); - + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setOverriddenName("Echo") + .setMethods(Arrays.asList(method)) + .build(); String results = writeStatements( ServiceClientHeaderSampleComposer.composeShowcaseMethodSample( - method, clientType, arguments, resourceNames, messageTypes)); + method, clientType, arguments, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java index bd6366b11f..68b76374a9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposerTest.java @@ -21,10 +21,12 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Sample; +import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.protoparser.Parser; import com.google.api.generator.testutils.LineFormatter; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.showcase.v1beta1.EchoOuterClass; +import java.util.Arrays; import java.util.Collections; import java.util.Map; import org.junit.Assert; @@ -67,10 +69,21 @@ public void valid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -118,11 +131,22 @@ public void invalid_composeDefaultSample_isPagedMethod() { .setMethodSignatures(Collections.emptyList()) .setPageSizeFieldName(PAGINATED_FIELD_NAME) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); Assert.assertThrows( NullPointerException.class, () -> ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); } @Test @@ -167,10 +191,21 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnResponse() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -225,10 +260,21 @@ public void valid_composeDefaultSample_hasLroMethodWithReturnVoid() { .setMethodSignatures(Collections.emptyList()) .setLro(lro) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -265,10 +311,21 @@ public void valid_composeDefaultSample_pureUnaryReturnVoid() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", @@ -316,10 +373,21 @@ public void valid_composeDefaultSample_pureUnaryReturnResponse() { .setOutputType(outputType) .setMethodSignatures(Collections.emptyList()) .build(); + Service service = + Service.builder() + .setName("Echo") + .setDefaultHost("localhost:7469") + .setOauthScopes(Arrays.asList("https://www.googleapis.com/auth/cloud-platform")) + .setPakkage(SHOWCASE_PACKAGE_NAME) + .setProtoPakkage(SHOWCASE_PACKAGE_NAME) + .setOriginalJavaPackage(SHOWCASE_PACKAGE_NAME) + .setMethods(Arrays.asList(method)) + .setOverriddenName("Echo") + .build(); String results = writeStatements( ServiceClientMethodSampleComposer.composeCanonicalSample( - method, clientType, resourceNames, messageTypes)); + method, clientType, resourceNames, messageTypes, service)); String expected = LineFormatter.lines( "try (EchoClient echoClient = EchoClient.create()) {\n", diff --git a/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java b/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java deleted file mode 100644 index b393a5bed3..0000000000 --- a/src/test/java/com/google/api/generator/gapic/composer/utils/ClassNamesTest.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.api.generator.gapic.composer.utils; - -import org.junit.Assert; -import org.junit.Test; - -public class ClassNamesTest { - @Test - public void getPureServiceName_returnsServiceName() { - Assert.assertEquals(ClassNames.getPureServiceName("EchoClient"), "Echo"); - Assert.assertEquals(ClassNames.getPureServiceName("Echo"), "Echo"); - Assert.assertEquals(ClassNames.getPureServiceName(""), ""); - Assert.assertEquals(ClassNames.getPureServiceName("ClientEcho"), ""); - Assert.assertEquals(ClassNames.getPureServiceName("echoclient"), "echoclient"); - Assert.assertEquals(ClassNames.getPureServiceName("echoClient"), "echo"); - Assert.assertEquals(ClassNames.getPureServiceName("echoServiceClient"), "echoService"); - } -} diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java index 5512d59424..d7d8937ff7 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/AsyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/AsyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; @@ -56,4 +56,4 @@ public static void asyncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_async] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java index 6b77dd5c0d..cf3eb73ece 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] import com.google.bigtable.v2.CheckAndMutateRowRequest; import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java index 803d65bc7b..1951fd7be8 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java index 1280e1fa29..7999251391 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowStringBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -52,4 +52,4 @@ public static void syncCheckAndMutateRowStringBytestringRowfilterListmutationLis } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_StringBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java index 5cf895095e..94b3498d56 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -51,4 +51,4 @@ public static void syncCheckAndMutateRowTablenameBytestringRowfilterListmutation } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java index 9cdcf53a07..ae5cef236b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/checkandmutaterow/SyncCheckAndMutateRowTablenameBytestringRowfilterListmutationListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] import com.google.bigtable.v2.CheckAndMutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.RowFilter; @@ -53,4 +53,4 @@ public static void main(String[] args) throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_CheckAndMutateRow_TablenameBytestringRowfilterListmutationListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java index f66938186f..7f26aef4f9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] +// [START bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_BaseBigtableData_Create_SetCredentialsProvider_sync] +// [END bigtable_v2_generated_Bigtable_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java index f6f57cfa51..c1a6d75ae8 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] +// [START bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] import com.google.cloud.bigtable.data.v2.BaseBigtableDataClient; import com.google.cloud.bigtable.data.v2.BaseBigtableDataSettings; import com.google.cloud.bigtable.data.v2.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { BaseBigtableDataClient.create(baseBigtableDataSettings); } } -// [END bigtable_v2_generated_BaseBigtableData_Create_SetEndpoint_sync] +// [END bigtable_v2_generated_Bigtable_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java index 50662848b6..7475c57d0a 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/AsyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/AsyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_async] +// [START bigtable_v2_generated_Bigtable_MutateRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; @@ -53,4 +53,4 @@ public static void asyncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_async] +// [END bigtable_v2_generated_Bigtable_MutateRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java index 2a781526b9..1d7439c6ca 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_sync] import com.google.bigtable.v2.MutateRowRequest; import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; @@ -49,4 +49,4 @@ public static void syncMutateRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java index cba00753a5..03d7191440 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowStringBytestringListmutation() throws Exception } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutation_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java index cce51bae93..dc2ce87b85 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowStringBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowStringBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowStringBytestringListmutationString() throws Exce } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_StringBytestringListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_StringBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java index ae4227348b..bab53b1aa9 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutation.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutation.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -45,4 +45,4 @@ public static void syncMutateRowTablenameBytestringListmutation() throws Excepti } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutation_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutation_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java similarity index 91% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java index 2bc9e66996..3802b87ef1 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterow/SyncMutateRowTablenameBytestringListmutationString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] +// [START bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] import com.google.bigtable.v2.MutateRowResponse; import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncMutateRowTablenameBytestringListmutationString() throws E } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRow_TablenameBytestringListmutationString_sync] +// [END bigtable_v2_generated_Bigtable_MutateRow_TablenameBytestringListmutationString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java index ef7cc157a2..452920dccf 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/mutaterows/AsyncMutateRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/mutaterows/AsyncMutateRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_MutateRows_async] +// [START bigtable_v2_generated_Bigtable_MutateRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.MutateRowsRequest; import com.google.bigtable.v2.MutateRowsResponse; @@ -51,4 +51,4 @@ public static void asyncMutateRows() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_MutateRows_async] +// [END bigtable_v2_generated_Bigtable_MutateRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java index 961a96ee4a..8ff05b78fb 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/AsyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/AsyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] import com.google.api.core.ApiFuture; import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; @@ -53,4 +53,4 @@ public static void asyncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_async] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java index 1c79af443d..4fc565753f 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRow.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRow.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] import com.google.bigtable.v2.ReadModifyWriteRowRequest; import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; @@ -49,4 +49,4 @@ public static void syncReadModifyWriteRow() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java index 05c6a3709c..0d065192e7 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java index 655f810290..958365977e 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowStringBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowStringBytestringListreadmodifywriterule } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_StringBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java similarity index 90% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java index 15f16dd17e..9369754dfa 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriterule.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -47,4 +47,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriterule_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java similarity index 89% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java index 5bfa5b796c..db2d6d950b 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readmodifywriterow/SyncReadModifyWriteRowTablenameBytestringListreadmodifywriteruleString.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [START bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] import com.google.bigtable.v2.ReadModifyWriteRowResponse; import com.google.bigtable.v2.ReadModifyWriteRule; import com.google.bigtable.v2.TableName; @@ -48,4 +48,4 @@ public static void syncReadModifyWriteRowTablenameBytestringListreadmodifywriter } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] +// [END bigtable_v2_generated_Bigtable_ReadModifyWriteRow_TablenameBytestringListreadmodifywriteruleString_sync] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java similarity index 94% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java index 745e7fbdc0..3228987659 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/readrows/AsyncReadRows.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/readrows/AsyncReadRows.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_ReadRows_async] +// [START bigtable_v2_generated_Bigtable_ReadRows_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.ReadRowsRequest; import com.google.bigtable.v2.ReadRowsResponse; @@ -54,4 +54,4 @@ public static void asyncReadRows() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_ReadRows_async] +// [END bigtable_v2_generated_Bigtable_ReadRows_async] diff --git a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java similarity index 93% rename from test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java rename to test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java index bd252a0f6d..113942be30 100644 --- a/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/basebigtabledata/samplerowkeys/AsyncSampleRowKeys.java +++ b/test/integration/goldens/bigtable/samples/snippets/generated/main/java/com/google/cloud/bigtable/data/v2/bigtable/samplerowkeys/AsyncSampleRowKeys.java @@ -16,7 +16,7 @@ package com.google.cloud.bigtable.data.v2.samples; -// [START bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] +// [START bigtable_v2_generated_Bigtable_SampleRowKeys_async] import com.google.api.gax.rpc.ServerStream; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; @@ -49,4 +49,4 @@ public static void asyncSampleRowKeys() throws Exception { } } } -// [END bigtable_v2_generated_BaseBigtableData_SampleRowKeys_async] +// [END bigtable_v2_generated_Bigtable_SampleRowKeys_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java index 3146b16b81..129efb9d77 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] +// [START iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IamCredentials_Create_SetCredentialsProvider_sync] +// [END iamcredentials_v1_generated_IAMCredentials_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java index facddbfac4..186d106cf4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] +// [START iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.IamCredentialsSettings; import com.google.cloud.iam.credentials.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create(iamCredentialsSettings); } } -// [END iamcredentials_v1_generated_IamCredentials_Create_SetEndpoint_sync] +// [END iamcredentials_v1_generated_IAMCredentials_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java index dee5a52a87..08e741cc66 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/AsyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; @@ -52,4 +52,4 @@ public static void asyncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_async] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java index b4ebf01b22..2a673667d2 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -48,4 +48,4 @@ public static void syncGenerateAccessToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java index ccdd12da60..d0f33dd855 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenServiceaccountnameListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -47,4 +47,4 @@ public static void syncGenerateAccessTokenServiceaccountnameListstringListstring } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_ServiceaccountnameListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java index 0cf10fcd52..677d546b13 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateaccesstoken/SyncGenerateAccessTokenStringListstringListstringDuration.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] import com.google.cloud.iam.credentials.v1.GenerateAccessTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateAccessTokenStringListstringListstringDuration() t } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateAccessToken_StringListstringListstringDuration_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java index f4191b5b76..14a6f9a845 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/AsyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; @@ -51,4 +51,4 @@ public static void asyncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_async] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java index 8de72543a3..324dd1adf3 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdToken.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenRequest; import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; @@ -47,4 +47,4 @@ public static void syncGenerateIdToken() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java index c0580eb919..cd3c4aafc4 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenServiceaccountnameListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -46,4 +46,4 @@ public static void syncGenerateIdTokenServiceaccountnameListstringStringBoolean( } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_ServiceaccountnameListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java index 7ce5cb46a5..373f8a35de 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/generateidtoken/SyncGenerateIdTokenStringListstringStringBoolean.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [START iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] import com.google.cloud.iam.credentials.v1.GenerateIdTokenResponse; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -45,4 +45,4 @@ public static void syncGenerateIdTokenStringListstringStringBoolean() throws Exc } } } -// [END iamcredentials_v1_generated_IamCredentials_GenerateIdToken_StringListstringStringBoolean_sync] +// [END iamcredentials_v1_generated_IAMCredentials_GenerateIdToken_StringListstringStringBoolean_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java index 52b0a779e4..6cafdbbfcd 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/AsyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_async] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -51,4 +51,4 @@ public static void asyncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_async] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java index 8a53f4257a..a4726eba69 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlob.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobRequest; @@ -47,4 +47,4 @@ public static void syncSignBlob() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java index 5d7fa16f03..60eb3b8789 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobServiceaccountnameListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobServiceaccountnameListstringBytestring() throws E } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_ServiceaccountnameListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java index d5fbb9b84e..bd0c2f01bb 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signblob/SyncSignBlobStringListstringBytestring.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignBlobResponse; @@ -44,4 +44,4 @@ public static void syncSignBlobStringListstringBytestring() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignBlob_StringListstringBytestring_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignBlob_StringListstringBytestring_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java index 4fa410b6bc..d17fc4c438 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/AsyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_async] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_async] import com.google.api.core.ApiFuture; import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; @@ -50,4 +50,4 @@ public static void asyncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_async] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_async] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java index 0ccf396ecf..77586e2558 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwt.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtRequest; @@ -46,4 +46,4 @@ public static void syncSignJwt() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java index 644b820f85..5ed7463567 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtServiceaccountnameListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtServiceaccountnameListstringString() throws Except } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_ServiceaccountnameListstringString_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_ServiceaccountnameListstringString_sync] diff --git a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java index a6e6e0426a..04ebefdbbc 100644 --- a/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java +++ b/test/integration/goldens/credentials/samples/snippets/generated/main/java/com/google/cloud/iam/credentials/v1/iamcredentials/signjwt/SyncSignJwtStringListstringString.java @@ -16,7 +16,7 @@ package com.google.cloud.iam.credentials.v1.samples; -// [START iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] +// [START iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] import com.google.cloud.iam.credentials.v1.IamCredentialsClient; import com.google.cloud.iam.credentials.v1.ServiceAccountName; import com.google.cloud.iam.credentials.v1.SignJwtResponse; @@ -43,4 +43,4 @@ public static void syncSignJwtStringListstringString() throws Exception { } } } -// [END iamcredentials_v1_generated_IamCredentials_SignJwt_StringListstringString_sync] +// [END iamcredentials_v1_generated_IAMCredentials_SignJwt_StringListstringString_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java index 432e6b9e51..0ede8778f3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_Config_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_ConfigServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java index 86efaf695f..37429d4a67 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_Create_SetEndpoint_sync] +// [START logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.cloud.logging.v2.ConfigSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { ConfigClient configClient = ConfigClient.create(configSettings); } } -// [END logging_v2_generated_Config_Create_SetEndpoint_sync] +// [END logging_v2_generated_ConfigServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java index 06be0eddaf..9f9c69a77d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/AsyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/AsyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateBucket_async] +// [START logging_v2_generated_ConfigServiceV2_CreateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; @@ -48,4 +48,4 @@ public static void asyncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_CreateBucket_async] +// [END logging_v2_generated_ConfigServiceV2_CreateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java index f38b8b932f..5cc7bc15b2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createbucket/SyncCreateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createbucket/SyncCreateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateBucketRequest; import com.google.logging.v2.LocationName; @@ -45,4 +45,4 @@ public static void syncCreateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_CreateBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java index 147251209b..b196b21eaf 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/AsyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/AsyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java index 5ceb46e142..f2a6dce03c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncCreateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java index e705079d85..145ed771c3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionBillingaccountnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionBillingaccountnameLogexclusion() throws Ex } } } -// [END logging_v2_generated_Config_CreateExclusion_BillingaccountnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_BillingaccountnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java index f3f10e65d9..3d2be77d9d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionFoldernameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -40,4 +40,4 @@ public static void syncCreateExclusionFoldernameLogexclusion() throws Exception } } } -// [END logging_v2_generated_Config_CreateExclusion_FoldernameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_FoldernameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java index f2ff73a6aa..e4198831ce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionOrganizationnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionOrganizationnameLogexclusion() throws Exce } } } -// [END logging_v2_generated_Config_CreateExclusion_OrganizationnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_OrganizationnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java index 07f7abd06b..ef4e209480 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionProjectnameLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionProjectnameLogexclusion() throws Exception } } } -// [END logging_v2_generated_Config_CreateExclusion_ProjectnameLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_ProjectnameLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java index c6080b9067..301ea7dcb3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createexclusion/SyncCreateExclusionStringLogexclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createexclusion/SyncCreateExclusionStringLogexclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateExclusionStringLogexclusion() throws Exception { } } } -// [END logging_v2_generated_Config_CreateExclusion_StringLogexclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateExclusion_StringLogexclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java index 0ab887e51e..88e10b4b70 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/AsyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/AsyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_async] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; @@ -48,4 +48,4 @@ public static void asyncCreateSink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_async] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java index c68927ba9c..35e03311e3 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateSinkRequest; import com.google.logging.v2.LogSink; @@ -45,4 +45,4 @@ public static void syncCreateSink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java index 3c639f4b92..76950150a9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkBillingaccountnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkBillingaccountnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkBillingaccountnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_BillingaccountnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_BillingaccountnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java index 24d9a1b890..935f2132c8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkFoldernameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkFoldernameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -40,4 +40,4 @@ public static void syncCreateSinkFoldernameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_FoldernameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_FoldernameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java index db8b873e53..428ae218be 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkOrganizationnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkOrganizationnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncCreateSinkOrganizationnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_OrganizationnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_OrganizationnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java index 4f2297db7d..f8bec0d167 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkProjectnameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkProjectnameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkProjectnameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_ProjectnameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_ProjectnameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java index c496d95bd6..1a840db162 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createsink/SyncCreateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createsink/SyncCreateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateSink_StringLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_CreateSink_StringLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java index 16454ea53a..b762e49489 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/AsyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/AsyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateView_async] +// [START logging_v2_generated_ConfigServiceV2_CreateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; @@ -47,4 +47,4 @@ public static void asyncCreateView() throws Exception { } } } -// [END logging_v2_generated_Config_CreateView_async] +// [END logging_v2_generated_ConfigServiceV2_CreateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java index 3ff765e96b..5f5ef37cb6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/createview/SyncCreateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/createview/SyncCreateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_CreateView_sync] +// [START logging_v2_generated_ConfigServiceV2_CreateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CreateViewRequest; import com.google.logging.v2.LogView; @@ -44,4 +44,4 @@ public static void syncCreateView() throws Exception { } } } -// [END logging_v2_generated_Config_CreateView_sync] +// [END logging_v2_generated_ConfigServiceV2_CreateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java index 42fa415a17..5c587bdefd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/AsyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/AsyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteBucket_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; @@ -48,4 +48,4 @@ public static void asyncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteBucket_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java index 1ce7361f17..d3aa6996c2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletebucket/SyncDeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletebucket/SyncDeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteBucketRequest; import com.google.logging.v2.LogBucketName; @@ -45,4 +45,4 @@ public static void syncDeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java index 02b7bc6c5f..506e711260 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/AsyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/AsyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java index 659b84d869..eea1f9c310 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteExclusionRequest; import com.google.logging.v2.LogExclusionName; @@ -44,4 +44,4 @@ public static void syncDeleteExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java index a135f9394e..cb6123be51 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_Logexclusionname_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java index 8fc355ff88..701c940ef7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteexclusion/SyncDeleteExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteexclusion/SyncDeleteExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteExclusion_String_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusionName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteExclusionString() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteExclusion_String_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java index 8eb8c5aa9a..56a4d9dc1a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/AsyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/AsyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java index 4ddf4b4d74..19759e39ca 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteSinkRequest; import com.google.logging.v2.LogSinkName; @@ -43,4 +43,4 @@ public static void syncDeleteSink() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java index 5800d2bc8b..eb9d8c45af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_Logsinkname_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_Logsinkname_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java index 461e1e00ce..19ccef5c23 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deletesink/SyncDeleteSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deletesink/SyncDeleteSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteSink_String_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSinkName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteSinkString() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteSink_String_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java index 050edd8160..8b92bebeb7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/AsyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/AsyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteView_async] +// [START logging_v2_generated_ConfigServiceV2_DeleteView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; @@ -49,4 +49,4 @@ public static void asyncDeleteView() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteView_async] +// [END logging_v2_generated_ConfigServiceV2_DeleteView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java index b7be382fa1..fe09d90db1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/deleteview/SyncDeleteView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/deleteview/SyncDeleteView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_DeleteView_sync] +// [START logging_v2_generated_ConfigServiceV2_DeleteView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.DeleteViewRequest; import com.google.logging.v2.LogViewName; @@ -46,4 +46,4 @@ public static void syncDeleteView() throws Exception { } } } -// [END logging_v2_generated_Config_DeleteView_sync] +// [END logging_v2_generated_ConfigServiceV2_DeleteView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java index b88c0bf58e..4e0599b144 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/AsyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/AsyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetBucket_async] +// [START logging_v2_generated_ConfigServiceV2_GetBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; @@ -48,4 +48,4 @@ public static void asyncGetBucket() throws Exception { } } } -// [END logging_v2_generated_Config_GetBucket_async] +// [END logging_v2_generated_ConfigServiceV2_GetBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java index 76f8f64dcd..996d6d8d0a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getbucket/SyncGetBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getbucket/SyncGetBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_GetBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetBucketRequest; import com.google.logging.v2.LogBucket; @@ -45,4 +45,4 @@ public static void syncGetBucket() throws Exception { } } } -// [END logging_v2_generated_Config_GetBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_GetBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java index a1a38dbe27..ad161fa1cd 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/AsyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/AsyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetCmekSettings_async] +// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -46,4 +46,4 @@ public static void asyncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_GetCmekSettings_async] +// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java index cedb4e7bf4..d1cc6edb97 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getcmeksettings/SyncGetCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getcmeksettings/SyncGetCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetCmekSettings_sync] +// [START logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.CmekSettingsName; @@ -43,4 +43,4 @@ public static void syncGetCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_GetCmekSettings_sync] +// [END logging_v2_generated_ConfigServiceV2_GetCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java index 0915b1c70b..cd68cdbd23 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/AsyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/AsyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; @@ -47,4 +47,4 @@ public static void asyncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java index 3419efced1..02526a974e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetExclusionRequest; import com.google.logging.v2.LogExclusion; @@ -44,4 +44,4 @@ public static void syncGetExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java index 42483f6648..7007f21027 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionLogexclusionname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionLogexclusionname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionLogexclusionname() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_Logexclusionname_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_Logexclusionname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java index 07b2643c50..9644892476 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getexclusion/SyncGetExclusionString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getexclusion/SyncGetExclusionString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetExclusion_String_sync] +// [START logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -39,4 +39,4 @@ public static void syncGetExclusionString() throws Exception { } } } -// [END logging_v2_generated_Config_GetExclusion_String_sync] +// [END logging_v2_generated_ConfigServiceV2_GetExclusion_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java index 851a6d9460..5741024009 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/AsyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/AsyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_async] +// [START logging_v2_generated_ConfigServiceV2_GetSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; @@ -46,4 +46,4 @@ public static void asyncGetSink() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_async] +// [END logging_v2_generated_ConfigServiceV2_GetSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java index 6c39d0fe51..5a204ee514 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetSinkRequest; import com.google.logging.v2.LogSink; @@ -43,4 +43,4 @@ public static void syncGetSink() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java index 3a4b4ff9d8..69624dd227 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkLogsinkname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkLogsinkname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_Logsinkname_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkLogsinkname() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_Logsinkname_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_Logsinkname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java index 1221c48ce9..d60d3e89fa 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getsink/SyncGetSinkString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getsink/SyncGetSinkString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetSink_String_sync] +// [START logging_v2_generated_ConfigServiceV2_GetSink_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -39,4 +39,4 @@ public static void syncGetSinkString() throws Exception { } } } -// [END logging_v2_generated_Config_GetSink_String_sync] +// [END logging_v2_generated_ConfigServiceV2_GetSink_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java index 3bfc68cd76..fca576b053 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/AsyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/AsyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetView_async] +// [START logging_v2_generated_ConfigServiceV2_GetView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; @@ -49,4 +49,4 @@ public static void asyncGetView() throws Exception { } } } -// [END logging_v2_generated_Config_GetView_async] +// [END logging_v2_generated_ConfigServiceV2_GetView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java index 1c9e3010d7..6162982ac0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/getview/SyncGetView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/getview/SyncGetView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_GetView_sync] +// [START logging_v2_generated_ConfigServiceV2_GetView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.GetViewRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncGetView() throws Exception { } } } -// [END logging_v2_generated_Config_GetView_sync] +// [END logging_v2_generated_ConfigServiceV2_GetView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java index f8de847d45..4a415a51e4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_async] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; @@ -50,4 +50,4 @@ public static void asyncListBuckets() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_async] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java index 438dd1ab4f..abd004d18a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/AsyncListBucketsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/AsyncListBucketsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListBucketsRequest; @@ -58,4 +58,4 @@ public static void asyncListBucketsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java index 1ceeba8e92..cced74307b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBuckets.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBuckets.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListBucketsRequest; import com.google.logging.v2.LocationName; @@ -47,4 +47,4 @@ public static void syncListBuckets() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java index dc60676d8c..210f92506a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsBillingaccountlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsBillingaccountlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountLocationName; import com.google.logging.v2.LogBucket; @@ -42,4 +42,4 @@ public static void syncListBucketsBillingaccountlocationname() throws Exception } } } -// [END logging_v2_generated_Config_ListBuckets_Billingaccountlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Billingaccountlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java index 08b69d8380..9b964e318c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsFolderlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsFolderlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderLocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsFolderlocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Folderlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Folderlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java index e7eef6601c..6eb3c8dccb 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsLocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsLocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Locationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsLocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Locationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Locationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java index 80c27cb25c..a8c3d488b5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsOrganizationlocationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsOrganizationlocationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.OrganizationLocationName; @@ -41,4 +41,4 @@ public static void syncListBucketsOrganizationlocationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_Organizationlocationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_Organizationlocationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java index 3dc2e09663..e12f7e109d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listbuckets/SyncListBucketsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listbuckets/SyncListBucketsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListBuckets_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LocationName; import com.google.logging.v2.LogBucket; @@ -41,4 +41,4 @@ public static void syncListBucketsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListBuckets_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListBuckets_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java index b5b751e512..9962b6b147 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_async] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; @@ -51,4 +51,4 @@ public static void asyncListExclusions() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_async] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java index dcc315a987..34a44b8418 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/AsyncListExclusionsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/AsyncListExclusionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListExclusionsRequest; @@ -58,4 +58,4 @@ public static void asyncListExclusionsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java index 50fcbb7413..57efa08b83 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusions.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusions.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListExclusionsRequest; import com.google.logging.v2.LogExclusion; @@ -47,4 +47,4 @@ public static void syncListExclusions() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java index 9939428ec0..053d366a89 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Billingaccountname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java index 3008fc13a1..e9a73d3f4f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Foldername_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogExclusion; @@ -41,4 +41,4 @@ public static void syncListExclusionsFoldername() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Foldername_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java index 457259ff27..db670ab3e1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Organizationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListExclusionsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Organizationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java index 087d4e7241..27142979e0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_Projectname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsProjectname() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_Projectname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java index 29eab9f45b..6f2889389b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listexclusions/SyncListExclusionsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listexclusions/SyncListExclusionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListExclusions_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListExclusionsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListExclusions_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListExclusions_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java index bf52d0e488..bab6ac1100 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_async] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; @@ -50,4 +50,4 @@ public static void asyncListSinks() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_async] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java index 66fc641d8b..8221ed0e47 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/AsyncListSinksPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/AsyncListSinksPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListSinksRequest; @@ -58,4 +58,4 @@ public static void asyncListSinksPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java index 28a7508ada..665b6f1e39 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinks.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinks.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListSinksRequest; import com.google.logging.v2.LogSink; @@ -47,4 +47,4 @@ public static void syncListSinks() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java index f90b7ddf60..41c8f681ef 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Billingaccountname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.BillingAccountName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Billingaccountname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java index ac9330d556..2b7d35ab97 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Foldername_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.FolderName; import com.google.logging.v2.LogSink; @@ -41,4 +41,4 @@ public static void syncListSinksFoldername() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Foldername_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java index 110aff10e2..264990af48 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Organizationname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.OrganizationName; @@ -41,4 +41,4 @@ public static void syncListSinksOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Organizationname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java index 991cf621c6..e44b6205ca 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_Projectname_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksProjectname() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_Projectname_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java index 251b54b9cd..52585a2f61 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listsinks/SyncListSinksString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listsinks/SyncListSinksString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListSinks_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListSinksString() throws Exception { } } } -// [END logging_v2_generated_Config_ListSinks_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListSinks_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java index 5063a7df09..2f50413e92 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_async] +// [START logging_v2_generated_ConfigServiceV2_ListViews_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; @@ -49,4 +49,4 @@ public static void asyncListViews() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_async] +// [END logging_v2_generated_ConfigServiceV2_ListViews_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java index 8e2b30f750..c11f0129e6 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/AsyncListViewsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/AsyncListViewsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_Paged_async] +// [START logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] import com.google.cloud.logging.v2.ConfigClient; import com.google.common.base.Strings; import com.google.logging.v2.ListViewsRequest; @@ -57,4 +57,4 @@ public static void asyncListViewsPaged() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_Paged_async] +// [END logging_v2_generated_ConfigServiceV2_ListViews_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java index 65ab409b36..b47aa44bce 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViews.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViews.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_sync] +// [START logging_v2_generated_ConfigServiceV2_ListViews_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.ListViewsRequest; import com.google.logging.v2.LogView; @@ -46,4 +46,4 @@ public static void syncListViews() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_sync] +// [END logging_v2_generated_ConfigServiceV2_ListViews_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java index 90d4eb7a3f..e4375e0440 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/listviews/SyncListViewsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/listviews/SyncListViewsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_ListViews_String_sync] +// [START logging_v2_generated_ConfigServiceV2_ListViews_String_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -40,4 +40,4 @@ public static void syncListViewsString() throws Exception { } } } -// [END logging_v2_generated_Config_ListViews_String_sync] +// [END logging_v2_generated_ConfigServiceV2_ListViews_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java index 4ac4f21600..bbc765fad4 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/AsyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/AsyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UndeleteBucket_async] +// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void asyncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UndeleteBucket_async] +// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java index a6d397c7bb..a701841e37 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/undeletebucket/SyncUndeleteBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/undeletebucket/SyncUndeleteBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UndeleteBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucketName; import com.google.logging.v2.UndeleteBucketRequest; @@ -45,4 +45,4 @@ public static void syncUndeleteBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UndeleteBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_UndeleteBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java index 2bdf045fef..3b41eca05a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/AsyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/AsyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateBucket_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; @@ -51,4 +51,4 @@ public static void asyncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateBucket_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java index 6bc0a81437..a869306187 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatebucket/SyncUpdateBucket.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatebucket/SyncUpdateBucket.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateBucket_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogBucket; import com.google.logging.v2.LogBucketName; @@ -48,4 +48,4 @@ public static void syncUpdateBucket() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateBucket_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateBucket_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java index 075afc71d9..fd173d5072 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/AsyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/AsyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateCmekSettings_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; @@ -49,4 +49,4 @@ public static void asyncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateCmekSettings_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java index 066db0f221..f0c7feb985 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatecmeksettings/SyncUpdateCmekSettings.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatecmeksettings/SyncUpdateCmekSettings.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateCmekSettings_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.CmekSettings; import com.google.logging.v2.UpdateCmekSettingsRequest; @@ -45,4 +45,4 @@ public static void syncUpdateCmekSettings() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateCmekSettings_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateCmekSettings_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java index e2c794e348..7b24e77c6f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/AsyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/AsyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; @@ -50,4 +50,4 @@ public static void asyncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateExclusion_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java index 635ae3138a..5599414833 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusion.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusion.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -47,4 +47,4 @@ public static void syncUpdateExclusion() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateExclusion_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java index 019d31b844..bc402ea94c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionLogexclusionnameLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionLogexclusionnameLogexclusionFieldmask() th } } } -// [END logging_v2_generated_Config_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_LogexclusionnameLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java index 0382f5dd3c..8e20f45a0b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateexclusion/SyncUpdateExclusionStringLogexclusionFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogExclusion; import com.google.logging.v2.LogExclusionName; @@ -42,4 +42,4 @@ public static void syncUpdateExclusionStringLogexclusionFieldmask() throws Excep } } } -// [END logging_v2_generated_Config_UpdateExclusion_StringLogexclusionFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateExclusion_StringLogexclusionFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java index ab63f731ff..e4d5c91e85 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/AsyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/AsyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; @@ -50,4 +50,4 @@ public static void asyncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java index a642e8af7f..af470dcb04 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -47,4 +47,4 @@ public static void syncUpdateSink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java index 8a6d30e840..f74d2c33de 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkLogsinknameLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java index 32323d55d3..aec9fbcd1f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkLogsinknameLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkLogsinknameLogsinkFieldmask() throws Exception } } } -// [END logging_v2_generated_Config_UpdateSink_LogsinknameLogsinkFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_LogsinknameLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java index 8e7effd922..902dc0926a 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsink.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsink.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_StringLogsink_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -40,4 +40,4 @@ public static void syncUpdateSinkStringLogsink() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_StringLogsink_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsink_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java index 1c7601f9e8..ff275027c0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updatesink/SyncUpdateSinkStringLogsinkFieldmask.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogSink; import com.google.logging.v2.LogSinkName; @@ -42,4 +42,4 @@ public static void syncUpdateSinkStringLogsinkFieldmask() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateSink_StringLogsinkFieldmask_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateSink_StringLogsinkFieldmask_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java index d184350a61..15c5e06efe 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/AsyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/AsyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateView_async] +// [START logging_v2_generated_ConfigServiceV2_UpdateView_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; @@ -48,4 +48,4 @@ public static void asyncUpdateView() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateView_async] +// [END logging_v2_generated_ConfigServiceV2_UpdateView_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java index de3ed279b0..fbe179a735 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/config/updateview/SyncUpdateView.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/configservicev2/updateview/SyncUpdateView.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Config_UpdateView_sync] +// [START logging_v2_generated_ConfigServiceV2_UpdateView_sync] import com.google.cloud.logging.v2.ConfigClient; import com.google.logging.v2.LogView; import com.google.logging.v2.UpdateViewRequest; @@ -45,4 +45,4 @@ public static void syncUpdateView() throws Exception { } } } -// [END logging_v2_generated_Config_UpdateView_sync] +// [END logging_v2_generated_ConfigServiceV2_UpdateView_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java index d3e7fce859..e816fa00c0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_Logging_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_LoggingServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java index cc7769f0b0..8f45174e6d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_Create_SetEndpoint_sync] +// [START logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.cloud.logging.v2.LoggingSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { LoggingClient loggingClient = LoggingClient.create(loggingSettings); } } -// [END logging_v2_generated_Logging_Create_SetEndpoint_sync] +// [END logging_v2_generated_LoggingServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java index 65dfbf6fc4..ddfc69170c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/AsyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/AsyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_async] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_async] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java index f58e35379b..0f4b8d4815 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLog.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLog.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.LogName; @@ -43,4 +43,4 @@ public static void syncDeleteLog() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java index c12ea2f593..58768449fc 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogLogname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogLogname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_Logname_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogLogname() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_Logname_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_Logname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java index fe86078e27..6322f88684 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/deletelog/SyncDeleteLogString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/deletelog/SyncDeleteLogString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_DeleteLog_String_sync] +// [START logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogString() throws Exception { } } } -// [END logging_v2_generated_Logging_DeleteLog_String_sync] +// [END logging_v2_generated_LoggingServiceV2_DeleteLog_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java index ef5d7e8ccb..882c03d6ad 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java index 2bfb1b6c3f..f018b6932d 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/AsyncListLogEntriesPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/AsyncListLogEntriesPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogEntriesRequest; @@ -60,4 +60,4 @@ public static void asyncListLogEntriesPaged() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java index 94861f9571..0809ee3bae 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogEntriesRequest; import com.google.logging.v2.LogEntry; @@ -49,4 +49,4 @@ public static void syncListLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java index 94ce4dac9a..0362f54077 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogentries/SyncListLogEntriesListstringStringString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogentries/SyncListLogEntriesListstringStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; import java.util.ArrayList; @@ -45,4 +45,4 @@ public static void syncListLogEntriesListstringStringString() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogEntries_ListstringStringString_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogEntries_ListstringStringString_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java index 6152c9cb13..f953d535ba 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; @@ -51,4 +51,4 @@ public static void asyncListLogs() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java index e2b6c24eab..8f1861dbc7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/AsyncListLogsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/AsyncListLogsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogsRequest; @@ -59,4 +59,4 @@ public static void asyncListLogsPaged() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java index ad9b101fe9..c3f2710ac0 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogs.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogs.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListLogsRequest; import com.google.logging.v2.ProjectName; @@ -48,4 +48,4 @@ public static void syncListLogs() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java index ea94e648b7..873f35192b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsBillingaccountname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsBillingaccountname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.BillingAccountName; @@ -40,4 +40,4 @@ public static void syncListLogsBillingaccountname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Billingaccountname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Billingaccountname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java index 97385d41dc..21f7c3d8f1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsFoldername.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsFoldername.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Foldername_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.FolderName; @@ -40,4 +40,4 @@ public static void syncListLogsFoldername() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Foldername_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Foldername_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java index f217a490ab..482880b0ea 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsOrganizationname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsOrganizationname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Organizationname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.OrganizationName; @@ -40,4 +40,4 @@ public static void syncListLogsOrganizationname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Organizationname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Organizationname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java index baeac438a0..56ae4bede8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_Projectname_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsProjectname() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_Projectname_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java index 343ea0797d..72be8ea87b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listlogs/SyncListLogsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listlogs/SyncListLogsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListLogs_String_sync] +// [START logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncListLogsString() throws Exception { } } } -// [END logging_v2_generated_Logging_ListLogs_String_sync] +// [END logging_v2_generated_LoggingServiceV2_ListLogs_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java index 0393705c87..7280fad4e7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -49,4 +49,4 @@ public static void asyncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_async] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java index a60e62e53f..cfc6c077af 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/AsyncListMonitoredResourceDescriptorsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.common.base.Strings; @@ -57,4 +57,4 @@ public static void asyncListMonitoredResourceDescriptorsPaged() throws Exception } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_Paged_async] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java index 0240d0ae20..14cc45dc9c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/listmonitoredresourcedescriptors/SyncListMonitoredResourceDescriptors.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] +// [START logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] import com.google.api.MonitoredResourceDescriptor; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest; @@ -46,4 +46,4 @@ public static void syncListMonitoredResourceDescriptors() throws Exception { } } } -// [END logging_v2_generated_Logging_ListMonitoredResourceDescriptors_sync] +// [END logging_v2_generated_LoggingServiceV2_ListMonitoredResourceDescriptors_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java index 04500ea8a9..cc2ea957f7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/taillogentries/AsyncTailLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/taillogentries/AsyncTailLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_TailLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_TailLogEntries_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.TailLogEntriesRequest; @@ -52,4 +52,4 @@ public static void asyncTailLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_TailLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_TailLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java index b8aac8db89..35a3265911 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/AsyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/AsyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_async] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] import com.google.api.MonitoredResource; import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.LoggingClient; @@ -56,4 +56,4 @@ public static void asyncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_WriteLogEntries_async] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java similarity index 94% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java index 649f1366b9..8d0b01bf25 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntries.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntries.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -52,4 +52,4 @@ public static void syncWriteLogEntries() throws Exception { } } } -// [END logging_v2_generated_Logging_WriteLogEntries_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java similarity index 89% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java index 65ba673580..bd79f3dd2e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesLognameMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesLognameMonitoredresourceMapstringstringLis } } } -// [END logging_v2_generated_Logging_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_LognameMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java index d69e7f5f35..830f5c9594 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/logging/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/loggingservicev2/writelogentries/SyncWriteLogEntriesStringMonitoredresourceMapstringstringListlogentry.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [START logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] import com.google.api.MonitoredResource; import com.google.cloud.logging.v2.LoggingClient; import com.google.logging.v2.LogEntry; @@ -50,4 +50,4 @@ public static void syncWriteLogEntriesStringMonitoredresourceMapstringstringList } } } -// [END logging_v2_generated_Logging_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] +// [END logging_v2_generated_LoggingServiceV2_WriteLogEntries_StringMonitoredresourceMapstringstringListlogentry_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java index 2b202407d3..01738692f9 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] +// [START logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_Metrics_Create_SetCredentialsProvider_sync] +// [END logging_v2_generated_MetricsServiceV2_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java index 74cba5dfc8..34cf57f15c 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_Create_SetEndpoint_sync] +// [START logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.cloud.logging.v2.MetricsSettings; import com.google.cloud.logging.v2.myEndpoint; @@ -37,4 +37,4 @@ public static void syncCreateSetEndpoint() throws Exception { MetricsClient metricsClient = MetricsClient.create(metricsSettings); } } -// [END logging_v2_generated_Metrics_Create_SetEndpoint_sync] +// [END logging_v2_generated_MetricsServiceV2_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java index bedd6dc546..4de99d41be 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/AsyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/AsyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; @@ -47,4 +47,4 @@ public static void asyncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java index f8fd7a6882..1d7b15926b 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -44,4 +44,4 @@ public static void syncCreateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java index 25844b26af..a6b645e580 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricProjectnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricProjectnameLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_ProjectnameLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_ProjectnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java index 0f3b22f116..55f0d05910 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/createlogmetric/SyncCreateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/createlogmetric/SyncCreateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -40,4 +40,4 @@ public static void syncCreateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_CreateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_CreateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java index fabe228bf2..9eaddcee33 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/AsyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/AsyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java index 5130f428fa..a0af69c351 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.DeleteLogMetricRequest; import com.google.logging.v2.LogMetricName; @@ -43,4 +43,4 @@ public static void syncDeleteLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java index a512881e8f..033de053ff 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_Logmetricname_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java index ac60ed04e7..69d8ab2df7 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/deletelogmetric/SyncDeleteLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/deletelogmetric/SyncDeleteLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_DeleteLogMetric_String_sync] +// [START logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetricName; import com.google.protobuf.Empty; @@ -39,4 +39,4 @@ public static void syncDeleteLogMetricString() throws Exception { } } } -// [END logging_v2_generated_Metrics_DeleteLogMetric_String_sync] +// [END logging_v2_generated_MetricsServiceV2_DeleteLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java index 32808dc48b..8bc22db42e 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/AsyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/AsyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; @@ -46,4 +46,4 @@ public static void asyncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java index b73437233f..c3054b8c91 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.GetLogMetricRequest; import com.google.logging.v2.LogMetric; @@ -43,4 +43,4 @@ public static void syncGetLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java index 9fe81972fb..be1612c929 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricLogmetricname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricLogmetricname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricLogmetricname() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_Logmetricname_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_Logmetricname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java index 49336d172d..8d28e37eb5 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/getlogmetric/SyncGetLogMetricString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/getlogmetric/SyncGetLogMetricString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_GetLogMetric_String_sync] +// [START logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -39,4 +39,4 @@ public static void syncGetLogMetricString() throws Exception { } } } -// [END logging_v2_generated_Metrics_GetLogMetric_String_sync] +// [END logging_v2_generated_MetricsServiceV2_GetLogMetric_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java index 9baa82c72e..517656c0ec 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_async] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; @@ -50,4 +50,4 @@ public static void asyncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_async] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java index e403a31d81..1cc0315ef1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/AsyncListLogMetricsPaged.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/AsyncListLogMetricsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_Paged_async] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] import com.google.cloud.logging.v2.MetricsClient; import com.google.common.base.Strings; import com.google.logging.v2.ListLogMetricsRequest; @@ -58,4 +58,4 @@ public static void asyncListLogMetricsPaged() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_Paged_async] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Paged_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java index 4cd6c5b24a..d32b3af8e1 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetrics.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetrics.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.ListLogMetricsRequest; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void syncListLogMetrics() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java index c9311ec6f5..f9da7ecb78 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsProjectname.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsProjectname() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_Projectname_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_Projectname_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java similarity index 91% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java index f549e4fcfd..a3e327bf56 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/listlogmetrics/SyncListLogMetricsString.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/listlogmetrics/SyncListLogMetricsString.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_ListLogMetrics_String_sync] +// [START logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.ProjectName; @@ -41,4 +41,4 @@ public static void syncListLogMetricsString() throws Exception { } } } -// [END logging_v2_generated_Metrics_ListLogMetrics_String_sync] +// [END logging_v2_generated_MetricsServiceV2_ListLogMetrics_String_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java similarity index 93% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java index b5b805473b..d2c0ac2d2f 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/AsyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/AsyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_async] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] import com.google.api.core.ApiFuture; import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; @@ -47,4 +47,4 @@ public static void asyncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_async] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_async] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java similarity index 92% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java index d9ddd5cabf..dd2f105604 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -44,4 +44,4 @@ public static void syncUpdateLogMetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java index 95afee63f1..656195a4f8 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricLogmetricnameLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricLogmetricnameLogmetric() throws Exception } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_LogmetricnameLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_LogmetricnameLogmetric_sync] diff --git a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java similarity index 90% rename from test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java rename to test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java index 72d5b2a914..c3a8f822d2 100644 --- a/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metrics/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java +++ b/test/integration/goldens/logging/samples/snippets/generated/main/java/com/google/cloud/logging/v2/metricsservicev2/updatelogmetric/SyncUpdateLogMetricStringLogmetric.java @@ -16,7 +16,7 @@ package com.google.cloud.logging.v2.samples; -// [START logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] +// [START logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] import com.google.cloud.logging.v2.MetricsClient; import com.google.logging.v2.LogMetric; import com.google.logging.v2.LogMetricName; @@ -40,4 +40,4 @@ public static void syncUpdateLogMetricStringLogmetric() throws Exception { } } } -// [END logging_v2_generated_Metrics_UpdateLogMetric_StringLogmetric_sync] +// [END logging_v2_generated_MetricsServiceV2_UpdateLogMetric_StringLogmetric_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java index 2689c5e644..47792ee22d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; @@ -41,4 +41,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_TopicAdmin_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_Publisher_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java index 7a9873e2e1..19398974d1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -38,4 +38,4 @@ public static void syncCreateSetEndpoint() throws Exception { TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings); } } -// [END pubsub_v1_generated_TopicAdmin_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_Publisher_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java index d2e14dd073..74621080e4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/AsyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/AsyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_async] +// [START pubsub_v1_generated_Publisher_CreateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; @@ -55,4 +55,4 @@ public static void asyncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_async] +// [END pubsub_v1_generated_Publisher_CreateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java index 40695121e2..a4b5de14e9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.MessageStoragePolicy; @@ -52,4 +52,4 @@ public static void syncCreateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java index c7fbe1a507..c5d7bf9bc2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_String_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java index a87e0a41ba..3fe1d8d1ce 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/createtopic/SyncCreateTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/createtopic/SyncCreateTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncCreateTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_CreateTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_CreateTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java index 54087a1a06..7333b31068 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/AsyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/AsyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_async] +// [START pubsub_v1_generated_Publisher_DeleteTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; @@ -46,4 +46,4 @@ public static void asyncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_async] +// [END pubsub_v1_generated_Publisher_DeleteTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java index 66d3598075..592d02f1e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteTopicRequest; @@ -43,4 +43,4 @@ public static void syncDeleteTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java index 54c2d3a70d..e38c29ba6c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_String_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java index ecfd69242a..d7e2b5ecfb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/deletetopic/SyncDeleteTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/deletetopic/SyncDeleteTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncDeleteTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DeleteTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_DeleteTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java index 570b9cba9c..6f476688b0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/AsyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/AsyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_async] +// [START pubsub_v1_generated_Publisher_DetachSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_async] +// [END pubsub_v1_generated_Publisher_DetachSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java index 0078b627cc..d246600768 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/detachsubscription/SyncDetachSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/detachsubscription/SyncDetachSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] +// [START pubsub_v1_generated_Publisher_DetachSubscription_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -43,4 +43,4 @@ public static void syncDetachSubscription() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_DetachSubscription_sync] +// [END pubsub_v1_generated_Publisher_DetachSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java index ba611dabba..7811b64d9b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] +// [START pubsub_v1_generated_Publisher_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_async] +// [END pubsub_v1_generated_Publisher_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java index 469141c01e..22b082ae1d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] +// [START pubsub_v1_generated_Publisher_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetIamPolicy_sync] +// [END pubsub_v1_generated_Publisher_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java index 38812517c2..6186bbc7f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/AsyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/AsyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_async] +// [START pubsub_v1_generated_Publisher_GetTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; @@ -46,4 +46,4 @@ public static void asyncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_async] +// [END pubsub_v1_generated_Publisher_GetTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java index a33abdc612..dae908367f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.Topic; @@ -43,4 +43,4 @@ public static void syncGetTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java index 8747bad91a..880d718804 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_String_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java index e73310c483..f1b638ad0c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/gettopic/SyncGetTopicTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/gettopic/SyncGetTopicTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] +// [START pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.Topic; import com.google.pubsub.v1.TopicName; @@ -39,4 +39,4 @@ public static void syncGetTopicTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_GetTopic_Topicname_sync] +// [END pubsub_v1_generated_Publisher_GetTopic_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java index 20e95874a9..bb5c209e76 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_async] +// [START pubsub_v1_generated_Publisher_ListTopics_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_async] +// [END pubsub_v1_generated_Publisher_ListTopics_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java index cd76f71f61..bc408435bb 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/AsyncListTopicsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/AsyncListTopicsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopics_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopics_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java index 225852c905..ef06991673 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopics.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopics.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListTopics() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java index 8a77860953..81bc425073 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_Projectname_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java index 7d5cef7204..99bcc8bf29 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopics/SyncListTopicsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopics/SyncListTopicsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopics_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Topic; @@ -41,4 +41,4 @@ public static void syncListTopicsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopics_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopics_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java index fe65e4f98c..d443239958 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_async] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java index b89916be96..70abfdafec 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/AsyncListTopicSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSnapshotsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java index dbf6f6c855..c09b9310f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSnapshotsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java index b8fcb98460..6b1af0211a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java index 143193b422..b049daf378 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsnapshots/SyncListTopicSnapshotsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSnapshotsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSnapshots_Topicname_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSnapshots_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java index d81e41eb1f..b4e989dd9d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -50,4 +50,4 @@ public static void asyncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_async] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java index 8e1e6e7443..f58ba30e98 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/AsyncListTopicSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -58,4 +58,4 @@ public static void asyncListTopicSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Paged_async] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java index ddacb54ab2..acbe537c50 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; import com.google.pubsub.v1.TopicName; @@ -46,4 +46,4 @@ public static void syncListTopicSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java index d3b44f61bb..51cc955ab3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_String_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java index 0b7ba70458..c9ca4db89c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/listtopicsubscriptions/SyncListTopicSubscriptionsTopicname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] +// [START pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.TopicName; @@ -40,4 +40,4 @@ public static void syncListTopicSubscriptionsTopicname() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_ListTopicSubscriptions_Topicname_sync] +// [END pubsub_v1_generated_Publisher_ListTopicSubscriptions_Topicname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java index 7be4c1d4a6..5923a643cc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/AsyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/AsyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_async] +// [START pubsub_v1_generated_Publisher_Publish_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; @@ -49,4 +49,4 @@ public static void asyncPublish() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_async] +// [END pubsub_v1_generated_Publisher_Publish_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java index 159a94a8b0..a38c98b0be 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublish.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublish.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_sync] +// [START pubsub_v1_generated_Publisher_Publish_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishRequest; import com.google.pubsub.v1.PublishResponse; @@ -46,4 +46,4 @@ public static void syncPublish() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_sync] +// [END pubsub_v1_generated_Publisher_Publish_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java index 0e293316b5..af9f822ea4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishStringListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishStringListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] +// [START pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishStringListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_StringListpubsubmessage_sync] +// [END pubsub_v1_generated_Publisher_Publish_StringListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java index 3ee1c88f3f..8f4cac5379 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/publish/SyncPublishTopicnameListpubsubmessage.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/publish/SyncPublishTopicnameListpubsubmessage.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] +// [START pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; @@ -43,4 +43,4 @@ public static void syncPublishTopicnameListpubsubmessage() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_Publish_TopicnameListpubsubmessage_sync] +// [END pubsub_v1_generated_Publisher_Publish_TopicnameListpubsubmessage_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java index a1e5d19d56..7532610f06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] +// [START pubsub_v1_generated_Publisher_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_async] +// [END pubsub_v1_generated_Publisher_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java index 25a50f9d5a..9bade67c6b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] +// [START pubsub_v1_generated_Publisher_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_SetIamPolicy_sync] +// [END pubsub_v1_generated_Publisher_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java index 2c521262f6..c2718a9def 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] +// [START pubsub_v1_generated_Publisher_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_async] +// [END pubsub_v1_generated_Publisher_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java index 2dfa13eb66..ab708587bc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] +// [START pubsub_v1_generated_Publisher_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_TestIamPermissions_sync] +// [END pubsub_v1_generated_Publisher_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java index 4a1dc41af9..b9aa104687 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/AsyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/AsyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_async] +// [START pubsub_v1_generated_Publisher_UpdateTopic_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; @@ -47,4 +47,4 @@ public static void asyncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_async] +// [END pubsub_v1_generated_Publisher_UpdateTopic_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java index ea1839364c..83ca0b9f16 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/topicadmin/updatetopic/SyncUpdateTopic.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/publisher/updatetopic/SyncUpdateTopic.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] +// [START pubsub_v1_generated_Publisher_UpdateTopic_sync] import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Topic; @@ -44,4 +44,4 @@ public static void syncUpdateTopic() throws Exception { } } } -// [END pubsub_v1_generated_TopicAdmin_UpdateTopic_sync] +// [END pubsub_v1_generated_Publisher_UpdateTopic_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java index 29614b0859..b61fc7b2c6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/AsyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/AsyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] +// [START pubsub_v1_generated_Subscriber_Acknowledge_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -48,4 +48,4 @@ public static void asyncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_async] +// [END pubsub_v1_generated_Subscriber_Acknowledge_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java index 751dfb0d78..5a9ffe0368 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledge.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledge.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.AcknowledgeRequest; @@ -45,4 +45,4 @@ public static void syncAcknowledge() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java index 8cdc60b790..71ca1c00ca 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeStringListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeStringListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeStringListstring() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_StringListstring_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_StringListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java index c34aa36f1d..23eb8043f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/acknowledge/SyncAcknowledgeSubscriptionnameListstring.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] +// [START pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncAcknowledgeSubscriptionnameListstring() throws Exception } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Acknowledge_SubscriptionnameListstring_sync] +// [END pubsub_v1_generated_Subscriber_Acknowledge_SubscriptionnameListstring_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java index 9b5057e476..c97f801f0b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetCredentialsProvider.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetCredentialsProvider.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] +// [START pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; @@ -42,4 +42,4 @@ public static void syncCreateSetCredentialsProvider() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetCredentialsProvider_sync] +// [END pubsub_v1_generated_Subscriber_Create_SetCredentialsProvider_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java index e23042c9c3..f8b340ee5f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/create/SyncCreateSetEndpoint.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/create/SyncCreateSetEndpoint.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] +// [START pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.SubscriptionAdminSettings; import com.google.cloud.pubsub.v1.myEndpoint; @@ -39,4 +39,4 @@ public static void syncCreateSetEndpoint() throws Exception { SubscriptionAdminClient.create(subscriptionAdminSettings); } } -// [END pubsub_v1_generated_SubscriptionAdmin_Create_SetEndpoint_sync] +// [END pubsub_v1_generated_Subscriber_Create_SetEndpoint_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java index 6fbc541b5e..268d565f18 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/AsyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/AsyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; @@ -51,4 +51,4 @@ public static void asyncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_async] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java index 29edfc51c5..f1025baa61 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -47,4 +47,4 @@ public static void syncCreateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java index 6946725a40..7fe500754d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameString_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java index 8411049f9e..cae1578959 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotSnapshotnameSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotSnapshotnameSubscriptionname() throws Excep } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_SnapshotnameSubscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_SnapshotnameSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java index da5863331b..fdf6b8daec 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringString_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringString_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java index 339814cabe..15bd89cb28 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsnapshot/SyncCreateSnapshotStringSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -41,4 +41,4 @@ public static void syncCreateSnapshotStringSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSnapshot_StringSubscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_CreateSnapshot_StringSubscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java index 7d51d4ea88..80d4398dcc 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/AsyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/AsyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; @@ -67,4 +67,4 @@ public static void asyncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_async] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java similarity index 95% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java index 6f9ec0df0f..6f7d3845b6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Duration; import com.google.pubsub.v1.DeadLetterPolicy; @@ -63,4 +63,4 @@ public static void syncCreateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java index 04f5007d19..92fa5bfd3e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringStringPushconfigInt() throws Exce } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringStringPushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java index a67223a046..141563b0a6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionStringTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionStringTopicnamePushconfigInt() throws E } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_StringTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_StringTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java index 574fe47706..bfd8ba0ad2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameStringPushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -45,4 +45,4 @@ public static void syncCreateSubscriptionSubscriptionnameStringPushconfigInt() t } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameStringPushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java index 4aee56b88d..7028163a76 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/createsubscription/SyncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [START pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; @@ -46,4 +46,4 @@ public static void syncCreateSubscriptionSubscriptionnameTopicnamePushconfigInt( } } } -// [END pubsub_v1_generated_SubscriptionAdmin_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] +// [END pubsub_v1_generated_Subscriber_CreateSubscription_SubscriptionnameTopicnamePushconfigInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java index 80b063f2d1..c85d0f4b06 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/AsyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/AsyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_async] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java index dd52f69b52..a807d55be0 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java index 4932bb9f6f..5a53e2cf88 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java index eaf04e65ee..a995d22f73 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesnapshot/SyncDeleteSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesnapshot/SyncDeleteSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncDeleteSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSnapshot_String_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java index b5b5cd8dab..60c66767e6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/AsyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/AsyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -47,4 +47,4 @@ public static void asyncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_async] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java index dad68bcb90..5eba50c9e9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.DeleteSubscriptionRequest; @@ -43,4 +43,4 @@ public static void syncDeleteSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java index 4b93510039..95ba167c91 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_String_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java index cd58d7c94a..b9af13c79c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/deletesubscription/SyncDeleteSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncDeleteSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_DeleteSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_DeleteSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java index a4008113c5..454c352c44 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/AsyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/AsyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] +// [START pubsub_v1_generated_Subscriber_GetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; @@ -48,4 +48,4 @@ public static void asyncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_async] +// [END pubsub_v1_generated_Subscriber_GetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java index 5f5010cdf0..2a0442533e 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getiampolicy/SyncGetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getiampolicy/SyncGetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] +// [START pubsub_v1_generated_Subscriber_GetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -45,4 +45,4 @@ public static void syncGetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetIamPolicy_sync] +// [END pubsub_v1_generated_Subscriber_GetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java index b23e6c203a..3683548922 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/AsyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/AsyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; @@ -47,4 +47,4 @@ public static void asyncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_async] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java index e6b917d600..c3e3815562 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSnapshotRequest; import com.google.pubsub.v1.Snapshot; @@ -43,4 +43,4 @@ public static void syncGetSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java index 9089e7a7eb..c31158a3ab 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotSnapshotname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotSnapshotname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotSnapshotname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_Snapshotname_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_Snapshotname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java index d0b1834191..66ef4b7d19 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsnapshot/SyncGetSnapshotString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsnapshot/SyncGetSnapshotString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] +// [START pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Snapshot; import com.google.pubsub.v1.SnapshotName; @@ -39,4 +39,4 @@ public static void syncGetSnapshotString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSnapshot_String_sync] +// [END pubsub_v1_generated_Subscriber_GetSnapshot_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java index 5aa661cd09..a6ff85a1fe 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/AsyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/AsyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] +// [START pubsub_v1_generated_Subscriber_GetSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; @@ -47,4 +47,4 @@ public static void asyncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_async] +// [END pubsub_v1_generated_Subscriber_GetSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java index af814f76d2..a49256c431 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.GetSubscriptionRequest; import com.google.pubsub.v1.Subscription; @@ -43,4 +43,4 @@ public static void syncGetSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java index 96318e4fb6..311862d3aa 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_String_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java index 9139aaea83..7cb6dc3a8d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/getsubscription/SyncGetSubscriptionSubscriptionname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/getsubscription/SyncGetSubscriptionSubscriptionname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] +// [START pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; @@ -39,4 +39,4 @@ public static void syncGetSubscriptionSubscriptionname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_GetSubscription_Subscriptionname_sync] +// [END pubsub_v1_generated_Subscriber_GetSubscription_Subscriptionname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java index 4bdc239e58..945a3c564b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -51,4 +51,4 @@ public static void asyncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_async] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java index 3a2e369ced..6baa3920b1 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/AsyncListSnapshotsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/AsyncListSnapshotsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSnapshotsRequest; @@ -59,4 +59,4 @@ public static void asyncListSnapshotsPaged() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Paged_async] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java index 6fa3525272..56a4755df7 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshots.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshots.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSnapshotsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSnapshots() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java index f17df582c9..ae798c14e5 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_Projectname_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java index c5c71dcdb8..25651fb030 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsnapshots/SyncListSnapshotsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsnapshots/SyncListSnapshotsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] +// [START pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Snapshot; @@ -41,4 +41,4 @@ public static void syncListSnapshotsString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSnapshots_String_sync] +// [END pubsub_v1_generated_Subscriber_ListSnapshots_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java index c80178b90b..a6bca38708 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -51,4 +51,4 @@ public static void asyncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_async] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java index 5caf00064a..c07bfa442a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/AsyncListSubscriptionsPaged.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/AsyncListSubscriptionsPaged.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.base.Strings; import com.google.pubsub.v1.ListSubscriptionsRequest; @@ -59,4 +59,4 @@ public static void asyncListSubscriptionsPaged() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Paged_async] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Paged_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java index 888b1baf12..efa610bb8c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ListSubscriptionsRequest; import com.google.pubsub.v1.ProjectName; @@ -47,4 +47,4 @@ public static void syncListSubscriptions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java index feec6ee394..bce6aabc30 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsProjectname.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsProjectname.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsProjectname() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_Projectname_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_Projectname_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java index 14e0d0a9e1..d11b3fefc3 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/listsubscriptions/SyncListSubscriptionsString.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/listsubscriptions/SyncListSubscriptionsString.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] +// [START pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.ProjectName; import com.google.pubsub.v1.Subscription; @@ -41,4 +41,4 @@ public static void syncListSubscriptionsString() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ListSubscriptions_String_sync] +// [END pubsub_v1_generated_Subscriber_ListSubscriptions_String_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java index 62c37591bb..2c80fe321a 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/AsyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/AsyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -50,4 +50,4 @@ public static void asyncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_async] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java index e606d1d958..b3462d25da 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadline.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadline.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyAckDeadlineRequest; @@ -46,4 +46,4 @@ public static void syncModifyAckDeadline() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java index 9c80163831..50afc17d80 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineStringListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineStringListstringInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_StringListstringInt_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_StringListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java index 0f6c75fb28..9508d6080c 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifyackdeadline/SyncModifyAckDeadlineSubscriptionnameListstringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [START pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.SubscriptionName; @@ -43,4 +43,4 @@ public static void syncModifyAckDeadlineSubscriptionnameListstringInt() throws E } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyAckDeadline_SubscriptionnameListstringInt_sync] +// [END pubsub_v1_generated_Subscriber_ModifyAckDeadline_SubscriptionnameListstringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java index e4f4b494a9..aa51e8dc59 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/AsyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/AsyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; @@ -49,4 +49,4 @@ public static void asyncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_async] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java index 4b98fffbf3..a6fbb2a8de 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.ModifyPushConfigRequest; @@ -45,4 +45,4 @@ public static void syncModifyPushConfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java index 9d10bea2aa..71642d3a42 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigStringPushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigStringPushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigStringPushconfig() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_StringPushconfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_StringPushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java similarity index 90% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java index a158e59cc0..f65ac93e46 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/modifypushconfig/SyncModifyPushConfigSubscriptionnamePushconfig.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [START pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.Empty; import com.google.pubsub.v1.PushConfig; @@ -41,4 +41,4 @@ public static void syncModifyPushConfigSubscriptionnamePushconfig() throws Excep } } } -// [END pubsub_v1_generated_SubscriptionAdmin_ModifyPushConfig_SubscriptionnamePushconfig_sync] +// [END pubsub_v1_generated_Subscriber_ModifyPushConfig_SubscriptionnamePushconfig_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java index f947a915b5..4ab60d852d 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/AsyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/AsyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_async] +// [START pubsub_v1_generated_Subscriber_Pull_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; @@ -48,4 +48,4 @@ public static void asyncPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_async] +// [END pubsub_v1_generated_Subscriber_Pull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java index c1a1079c5d..8bed94fe25 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_sync] +// [START pubsub_v1_generated_Subscriber_Pull_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullRequest; import com.google.pubsub.v1.PullResponse; @@ -45,4 +45,4 @@ public static void syncPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_sync] +// [END pubsub_v1_generated_Subscriber_Pull_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java index bf9f3708ef..ae23e170c9 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullStringBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringBooleanInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_StringBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java index 33f0db5f86..19bb1784a2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullStringInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullStringInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_StringInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullStringInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_StringInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_StringInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java index 48adb74d45..9ade351b72 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameBooleanInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameBooleanInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -42,4 +42,4 @@ public static void syncPullSubscriptionnameBooleanInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameBooleanInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameBooleanInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java similarity index 91% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java index 5062165713..61a62b6a2f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/pull/SyncPullSubscriptionnameInt.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/pull/SyncPullSubscriptionnameInt.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] +// [START pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.SubscriptionName; @@ -40,4 +40,4 @@ public static void syncPullSubscriptionnameInt() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Pull_SubscriptionnameInt_sync] +// [END pubsub_v1_generated_Subscriber_Pull_SubscriptionnameInt_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java index 55212dd97d..c3641d8473 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/AsyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/AsyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Seek_async] +// [START pubsub_v1_generated_Subscriber_Seek_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; @@ -46,4 +46,4 @@ public static void asyncSeek() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Seek_async] +// [END pubsub_v1_generated_Subscriber_Seek_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java index 70a99a9ef7..6ff5634e7f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/seek/SyncSeek.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/seek/SyncSeek.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_Seek_sync] +// [START pubsub_v1_generated_Subscriber_Seek_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SeekRequest; import com.google.pubsub.v1.SeekResponse; @@ -43,4 +43,4 @@ public static void syncSeek() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_Seek_sync] +// [END pubsub_v1_generated_Subscriber_Seek_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java index ac7cb04a37..d24e119bbd 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/AsyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/AsyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] +// [START pubsub_v1_generated_Subscriber_SetIamPolicy_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; @@ -47,4 +47,4 @@ public static void asyncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_async] +// [END pubsub_v1_generated_Subscriber_SetIamPolicy_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java index 38453850c6..9c3b9b27e2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/setiampolicy/SyncSetIamPolicy.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/setiampolicy/SyncSetIamPolicy.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] +// [START pubsub_v1_generated_Subscriber_SetIamPolicy_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -44,4 +44,4 @@ public static void syncSetIamPolicy() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_SetIamPolicy_sync] +// [END pubsub_v1_generated_Subscriber_SetIamPolicy_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java similarity index 94% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java index 72baf12607..eac398483f 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/streamingpull/AsyncStreamingPull.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/streamingpull/AsyncStreamingPull.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] +// [START pubsub_v1_generated_Subscriber_StreamingPull_async] import com.google.api.gax.rpc.BidiStream; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.StreamingPullRequest; @@ -57,4 +57,4 @@ public static void asyncStreamingPull() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_StreamingPull_async] +// [END pubsub_v1_generated_Subscriber_StreamingPull_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java index 8cd6983fa8..2060857ad6 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/AsyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/AsyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] +// [START pubsub_v1_generated_Subscriber_TestIamPermissions_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; @@ -49,4 +49,4 @@ public static void asyncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_async] +// [END pubsub_v1_generated_Subscriber_TestIamPermissions_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java index b412b30fbb..e25ec0d84b 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/testiampermissions/SyncTestIamPermissions.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/testiampermissions/SyncTestIamPermissions.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] +// [START pubsub_v1_generated_Subscriber_TestIamPermissions_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; @@ -45,4 +45,4 @@ public static void syncTestIamPermissions() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_TestIamPermissions_sync] +// [END pubsub_v1_generated_Subscriber_TestIamPermissions_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java index 36ce3fd425..16fadb5d46 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/AsyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/AsyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] +// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_async] +// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java index 742fd2aeb5..fce6a9df70 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesnapshot/SyncUpdateSnapshot.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesnapshot/SyncUpdateSnapshot.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] +// [START pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Snapshot; @@ -44,4 +44,4 @@ public static void syncUpdateSnapshot() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSnapshot_sync] +// [END pubsub_v1_generated_Subscriber_UpdateSnapshot_sync] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java similarity index 93% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java index 0d442b959b..1e3fbd18f2 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/AsyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/AsyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] +// [START pubsub_v1_generated_Subscriber_UpdateSubscription_async] import com.google.api.core.ApiFuture; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; @@ -48,4 +48,4 @@ public static void asyncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_async] +// [END pubsub_v1_generated_Subscriber_UpdateSubscription_async] diff --git a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java similarity index 92% rename from test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java rename to test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java index c4ec8bfe5f..517495e7a4 100644 --- a/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriptionadmin/updatesubscription/SyncUpdateSubscription.java +++ b/test/integration/goldens/pubsub/samples/snippets/generated/main/java/com/google/cloud/pubsub/v1/subscriber/updatesubscription/SyncUpdateSubscription.java @@ -16,7 +16,7 @@ package com.google.cloud.pubsub.v1.samples; -// [START pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] +// [START pubsub_v1_generated_Subscriber_UpdateSubscription_sync] import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.protobuf.FieldMask; import com.google.pubsub.v1.Subscription; @@ -44,4 +44,4 @@ public static void syncUpdateSubscription() throws Exception { } } } -// [END pubsub_v1_generated_SubscriptionAdmin_UpdateSubscription_sync] +// [END pubsub_v1_generated_Subscriber_UpdateSubscription_sync] From 7941431c2f8222185bc70b328ff4c740001e488c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 20:29:53 -0700 Subject: [PATCH 5/5] chore(main): release 2.10.3 (#1079) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ version.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069098dbe2..5c3772c261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.10.3](https://github.com/googleapis/gapic-generator-java/compare/v2.10.2...v2.10.3) (2022-11-01) + + +### Bug Fixes + +* Fix REST transport client creation generated javadoc sample ([#1077](https://github.com/googleapis/gapic-generator-java/issues/1077)) ([9ac0ca8](https://github.com/googleapis/gapic-generator-java/commit/9ac0ca80b09077f7880f0029b5d7b090a10a10b8)) +* Fixes regionTag breakage ([#1068](https://github.com/googleapis/gapic-generator-java/issues/1068)) ([bed9f72](https://github.com/googleapis/gapic-generator-java/commit/bed9f721fbafb5f2e974b6f43f8455f2fdb581f7)) + ## [2.10.2](https://github.com/googleapis/gapic-generator-java/compare/v2.10.1...v2.10.2) (2022-10-24) diff --git a/version.txt b/version.txt index c6436a8536..5f4f65c859 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.10.2 +2.10.3