fix(resnames): Fix resname builder name conflicts in ctor with this a…

…ssignment (#769)
googleapis · Jun 16, 2021 · edac844 · edac844
1 parent 4f187b1
commit edac844
Show file tree

Hide file tree

Showing 38 changed files with 84 additions and 83 deletions.
diff --git a/...com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/...com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java
@@ -1632,7 +1632,8 @@ private static ClassDefinition createNestedBuilderClass(
       for (int i = 0; i < tokens.size(); i++) {
         String token = tokens.get(i);
         String lowerCamelTokenName = JavaStyle.toLowerCamelCase(token);
-        VariableExpr currClassTokenVarExpr = classMemberVarExprs.get(i);
+        VariableExpr currClassTokenVarExpr =
+            classMemberVarExprs.get(i).toBuilder().setExprReferenceExpr(thisExpr).build();
         builderCtorBodyExprs.add(
             AssignmentExpr.builder()
                 .setVariableExpr(currClassTokenVarExpr)

diff --git a/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden b/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden
@@ -217,8 +217,8 @@ public class AgentName implements ResourceName {
       Preconditions.checkArgument(
           Objects.equals(agentName.pathTemplate, PROJECT_LOCATION),
           "toBuilder is only supported when AgentName has the pattern of projects/{project}/locations/{location}/agent");
-      project = agentName.project;
-      location = agentName.location;
+      this.project = agentName.project;
+      this.location = agentName.location;
     }
 
     public AgentName build() {

diff --git a/...oogle/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden b/...oogle/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden
@@ -168,8 +168,8 @@ public class BillingAccountLocationName implements ResourceName {
     }
 
     private Builder(BillingAccountLocationName billingAccountLocationName) {
-      billingAccount = billingAccountLocationName.billingAccount;
-      location = billingAccountLocationName.location;
+      this.billingAccount = billingAccountLocationName.billingAccount;
+      this.location = billingAccountLocationName.location;
     }
 
     public BillingAccountLocationName build() {

diff --git a/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden b/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden
@@ -317,8 +317,8 @@ public class FoobarName implements ResourceName {
       Preconditions.checkArgument(
           Objects.equals(foobarName.pathTemplate, PROJECT_FOOBAR),
           "toBuilder is only supported when FoobarName has the pattern of projects/{project}/foobars/{foobar}");
-      project = foobarName.project;
-      foobar = foobarName.foobar;
+      this.project = foobarName.project;
+      this.foobar = foobarName.foobar;
     }
 
     public FoobarName build() {

diff --git a/...test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden b/...test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden
@@ -142,7 +142,7 @@ public class SessionName implements ResourceName {
     }
 
     private Builder(SessionName sessionName) {
-      session = sessionName.session;
+      this.session = sessionName.session;
     }
 
     public SessionName build() {

diff --git a/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden b/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden
@@ -194,9 +194,9 @@ public class TestName implements ResourceName {
     }
 
     private Builder(TestName testName) {
-      session = testName.session;
-      shardId = testName.shardId;
-      testId = testName.testId;
+      this.session = testName.session;
+      this.shardId = testName.shardId;
+      this.testId = testName.testId;
     }
 
     public TestName build() {

diff --git a/test/integration/goldens/asset/com/google/cloud/asset/v1/FeedName.java b/test/integration/goldens/asset/com/google/cloud/asset/v1/FeedName.java
@@ -295,8 +295,8 @@ private Builder(FeedName feedName) {
       Preconditions.checkArgument(
           Objects.equals(feedName.pathTemplate, PROJECT_FEED),
           "toBuilder is only supported when FeedName has the pattern of projects/{project}/feeds/{feed}");
-      project = feedName.project;
-      feed = feedName.feed;
+      this.project = feedName.project;
+      this.feed = feedName.feed;
     }
 
     public FeedName build() {

diff --git a/...tegration/goldens/credentials/com/google/cloud/iam/credentials/v1/ServiceAccountName.java b/...tegration/goldens/credentials/com/google/cloud/iam/credentials/v1/ServiceAccountName.java
@@ -182,8 +182,8 @@ public Builder setServiceAccount(String serviceAccount) {
     }
 
     private Builder(ServiceAccountName serviceAccountName) {
-      project = serviceAccountName.project;
-      serviceAccount = serviceAccountName.serviceAccount;
+      this.project = serviceAccountName.project;
+      this.serviceAccount = serviceAccountName.serviceAccount;
     }
 
     public ServiceAccountName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/CryptoKeyName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/CryptoKeyName.java
@@ -248,10 +248,10 @@ public Builder setCryptoKey(String cryptoKey) {
     }
 
     private Builder(CryptoKeyName cryptoKeyName) {
-      project = cryptoKeyName.project;
-      location = cryptoKeyName.location;
-      keyRing = cryptoKeyName.keyRing;
-      cryptoKey = cryptoKeyName.cryptoKey;
+      this.project = cryptoKeyName.project;
+      this.location = cryptoKeyName.location;
+      this.keyRing = cryptoKeyName.keyRing;
+      this.cryptoKey = cryptoKeyName.cryptoKey;
     }
 
     public CryptoKeyName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/CryptoKeyVersionName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/CryptoKeyVersionName.java
@@ -284,11 +284,11 @@ public Builder setCryptoKeyVersion(String cryptoKeyVersion) {
     }
 
     private Builder(CryptoKeyVersionName cryptoKeyVersionName) {
-      project = cryptoKeyVersionName.project;
-      location = cryptoKeyVersionName.location;
-      keyRing = cryptoKeyVersionName.keyRing;
-      cryptoKey = cryptoKeyVersionName.cryptoKey;
-      cryptoKeyVersion = cryptoKeyVersionName.cryptoKeyVersion;
+      this.project = cryptoKeyVersionName.project;
+      this.location = cryptoKeyVersionName.location;
+      this.keyRing = cryptoKeyVersionName.keyRing;
+      this.cryptoKey = cryptoKeyVersionName.cryptoKey;
+      this.cryptoKeyVersion = cryptoKeyVersionName.cryptoKeyVersion;
     }
 
     public CryptoKeyVersionName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/ImportJobName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/ImportJobName.java
@@ -248,10 +248,10 @@ public Builder setImportJob(String importJob) {
     }
 
     private Builder(ImportJobName importJobName) {
-      project = importJobName.project;
-      location = importJobName.location;
-      keyRing = importJobName.keyRing;
-      importJob = importJobName.importJob;
+      this.project = importJobName.project;
+      this.location = importJobName.location;
+      this.keyRing = importJobName.keyRing;
+      this.importJob = importJobName.importJob;
     }
 
     public ImportJobName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/KeyRingName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/KeyRingName.java
@@ -211,9 +211,9 @@ public Builder setKeyRing(String keyRing) {
     }
 
     private Builder(KeyRingName keyRingName) {
-      project = keyRingName.project;
-      location = keyRingName.location;
-      keyRing = keyRingName.keyRing;
+      this.project = keyRingName.project;
+      this.location = keyRingName.location;
+      this.keyRing = keyRingName.keyRing;
     }
 
     public KeyRingName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/LocationName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/LocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
     }
 
     private Builder(LocationName locationName) {
-      project = locationName.project;
-      location = locationName.location;
+      this.project = locationName.project;
+      this.location = locationName.location;
     }
 
     public LocationName build() {

diff --git a/test/integration/goldens/kms/com/google/cloud/kms/v1/PublicKeyName.java b/test/integration/goldens/kms/com/google/cloud/kms/v1/PublicKeyName.java
@@ -284,11 +284,11 @@ public Builder setCryptoKeyVersion(String cryptoKeyVersion) {
     }
 
     private Builder(PublicKeyName publicKeyName) {
-      project = publicKeyName.project;
-      location = publicKeyName.location;
-      keyRing = publicKeyName.keyRing;
-      cryptoKey = publicKeyName.cryptoKey;
-      cryptoKeyVersion = publicKeyName.cryptoKeyVersion;
+      this.project = publicKeyName.project;
+      this.location = publicKeyName.location;
+      this.keyRing = publicKeyName.keyRing;
+      this.cryptoKey = publicKeyName.cryptoKey;
+      this.cryptoKeyVersion = publicKeyName.cryptoKeyVersion;
     }
 
     public PublicKeyName build() {

diff --git a/test/integration/goldens/library/com/google/example/library/v1/BookName.java b/test/integration/goldens/library/com/google/example/library/v1/BookName.java
@@ -180,8 +180,8 @@ public Builder setBook(String book) {
     }
 
     private Builder(BookName bookName) {
-      shelf = bookName.shelf;
-      book = bookName.book;
+      this.shelf = bookName.shelf;
+      this.book = bookName.book;
     }
 
     public BookName build() {

diff --git a/test/integration/goldens/library/com/google/example/library/v1/ShelfName.java b/test/integration/goldens/library/com/google/example/library/v1/ShelfName.java
@@ -158,7 +158,7 @@ public Builder setShelfId(String shelfId) {
     }
 
     private Builder(ShelfName shelfName) {
-      shelfId = shelfName.shelfId;
+      this.shelfId = shelfName.shelfId;
     }
 
     public ShelfName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/BillingAccountLocationName.java b/test/integration/goldens/logging/com/google/logging/v2/BillingAccountLocationName.java
@@ -184,8 +184,8 @@ public Builder setLocation(String location) {
     }
 
     private Builder(BillingAccountLocationName billingAccountLocationName) {
-      billingAccount = billingAccountLocationName.billingAccount;
-      location = billingAccountLocationName.location;
+      this.billingAccount = billingAccountLocationName.billingAccount;
+      this.location = billingAccountLocationName.location;
     }
 
     public BillingAccountLocationName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/BillingAccountName.java b/test/integration/goldens/logging/com/google/logging/v2/BillingAccountName.java
@@ -158,7 +158,7 @@ public Builder setBillingAccount(String billingAccount) {
     }
 
     private Builder(BillingAccountName billingAccountName) {
-      billingAccount = billingAccountName.billingAccount;
+      this.billingAccount = billingAccountName.billingAccount;
     }
 
     public BillingAccountName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/CmekSettingsName.java b/test/integration/goldens/logging/com/google/logging/v2/CmekSettingsName.java
@@ -310,7 +310,7 @@ private Builder(CmekSettingsName cmekSettingsName) {
       Preconditions.checkArgument(
           Objects.equals(cmekSettingsName.pathTemplate, PROJECT),
           "toBuilder is only supported when CmekSettingsName has the pattern of projects/{project}/cmekSettings");
-      project = cmekSettingsName.project;
+      this.project = cmekSettingsName.project;
     }
 
     public CmekSettingsName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/FolderLocationName.java b/test/integration/goldens/logging/com/google/logging/v2/FolderLocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
     }
 
     private Builder(FolderLocationName folderLocationName) {
-      folder = folderLocationName.folder;
-      location = folderLocationName.location;
+      this.folder = folderLocationName.folder;
+      this.location = folderLocationName.location;
     }
 
     public FolderLocationName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/FolderName.java b/test/integration/goldens/logging/com/google/logging/v2/FolderName.java
@@ -158,7 +158,7 @@ public Builder setFolder(String folder) {
     }
 
     private Builder(FolderName folderName) {
-      folder = folderName.folder;
+      this.folder = folderName.folder;
     }
 
     public FolderName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LocationName.java b/test/integration/goldens/logging/com/google/logging/v2/LocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
     }
 
     private Builder(LocationName locationName) {
-      project = locationName.project;
-      location = locationName.location;
+      this.project = locationName.project;
+      this.location = locationName.location;
     }
 
     public LocationName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogBucketName.java b/test/integration/goldens/logging/com/google/logging/v2/LogBucketName.java
@@ -415,9 +415,9 @@ private Builder(LogBucketName logBucketName) {
       Preconditions.checkArgument(
           Objects.equals(logBucketName.pathTemplate, PROJECT_LOCATION_BUCKET),
           "toBuilder is only supported when LogBucketName has the pattern of projects/{project}/locations/{location}/buckets/{bucket}");
-      project = logBucketName.project;
-      location = logBucketName.location;
-      bucket = logBucketName.bucket;
+      this.project = logBucketName.project;
+      this.location = logBucketName.location;
+      this.bucket = logBucketName.bucket;
     }
 
     public LogBucketName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogExclusionName.java b/test/integration/goldens/logging/com/google/logging/v2/LogExclusionName.java
@@ -354,8 +354,8 @@ private Builder(LogExclusionName logExclusionName) {
       Preconditions.checkArgument(
           Objects.equals(logExclusionName.pathTemplate, PROJECT_EXCLUSION),
           "toBuilder is only supported when LogExclusionName has the pattern of projects/{project}/exclusions/{exclusion}");
-      project = logExclusionName.project;
-      exclusion = logExclusionName.exclusion;
+      this.project = logExclusionName.project;
+      this.exclusion = logExclusionName.exclusion;
     }
 
     public LogExclusionName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogMetricName.java b/test/integration/goldens/logging/com/google/logging/v2/LogMetricName.java
@@ -180,8 +180,8 @@ public Builder setMetric(String metric) {
     }
 
     private Builder(LogMetricName logMetricName) {
-      project = logMetricName.project;
-      metric = logMetricName.metric;
+      this.project = logMetricName.project;
+      this.metric = logMetricName.metric;
     }
 
     public LogMetricName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogName.java b/test/integration/goldens/logging/com/google/logging/v2/LogName.java
@@ -340,8 +340,8 @@ private Builder(LogName logName) {
       Preconditions.checkArgument(
           Objects.equals(logName.pathTemplate, PROJECT_LOG),
           "toBuilder is only supported when LogName has the pattern of projects/{project}/logs/{log}");
-      project = logName.project;
-      log = logName.log;
+      this.project = logName.project;
+      this.log = logName.log;
     }
 
     public LogName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogSinkName.java b/test/integration/goldens/logging/com/google/logging/v2/LogSinkName.java
@@ -344,8 +344,8 @@ private Builder(LogSinkName logSinkName) {
       Preconditions.checkArgument(
           Objects.equals(logSinkName.pathTemplate, PROJECT_SINK),
           "toBuilder is only supported when LogSinkName has the pattern of projects/{project}/sinks/{sink}");
-      project = logSinkName.project;
-      sink = logSinkName.sink;
+      this.project = logSinkName.project;
+      this.sink = logSinkName.sink;
     }
 
     public LogSinkName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/LogViewName.java b/test/integration/goldens/logging/com/google/logging/v2/LogViewName.java
@@ -472,10 +472,10 @@ private Builder(LogViewName logViewName) {
       Preconditions.checkArgument(
           Objects.equals(logViewName.pathTemplate, PROJECT_LOCATION_BUCKET_VIEW),
           "toBuilder is only supported when LogViewName has the pattern of projects/{project}/locations/{location}/buckets/{bucket}/views/{view}");
-      project = logViewName.project;
-      location = logViewName.location;
-      bucket = logViewName.bucket;
-      view = logViewName.view;
+      this.project = logViewName.project;
+      this.location = logViewName.location;
+      this.bucket = logViewName.bucket;
+      this.view = logViewName.view;
     }
 
     public LogViewName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/OrganizationLocationName.java b/test/integration/goldens/logging/com/google/logging/v2/OrganizationLocationName.java
@@ -181,8 +181,8 @@ public Builder setLocation(String location) {
     }
 
     private Builder(OrganizationLocationName organizationLocationName) {
-      organization = organizationLocationName.organization;
-      location = organizationLocationName.location;
+      this.organization = organizationLocationName.organization;
+      this.location = organizationLocationName.location;
     }
 
     public OrganizationLocationName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/OrganizationName.java b/test/integration/goldens/logging/com/google/logging/v2/OrganizationName.java
@@ -158,7 +158,7 @@ public Builder setOrganization(String organization) {
     }
 
     private Builder(OrganizationName organizationName) {
-      organization = organizationName.organization;
+      this.organization = organizationName.organization;
     }
 
     public OrganizationName build() {

diff --git a/test/integration/goldens/logging/com/google/logging/v2/ProjectName.java b/test/integration/goldens/logging/com/google/logging/v2/ProjectName.java
@@ -158,7 +158,7 @@ public Builder setProject(String project) {
     }
 
     private Builder(ProjectName projectName) {
-      project = projectName.project;
+      this.project = projectName.project;
     }
 
     public ProjectName build() {

diff --git a/test/integration/goldens/pubsub/com/google/pubsub/v1/ProjectName.java b/test/integration/goldens/pubsub/com/google/pubsub/v1/ProjectName.java
@@ -158,7 +158,7 @@ public Builder setProject(String project) {
     }
 
     private Builder(ProjectName projectName) {
-      project = projectName.project;
+      this.project = projectName.project;
     }
 
     public ProjectName build() {

diff --git a/test/integration/goldens/pubsub/com/google/pubsub/v1/SchemaName.java b/test/integration/goldens/pubsub/com/google/pubsub/v1/SchemaName.java
@@ -180,8 +180,8 @@ public Builder setSchema(String schema) {
     }
 
     private Builder(SchemaName schemaName) {
-      project = schemaName.project;
-      schema = schemaName.schema;
+      this.project = schemaName.project;
+      this.schema = schemaName.schema;
     }
 
     public SchemaName build() {

diff --git a/test/integration/goldens/pubsub/com/google/pubsub/v1/SnapshotName.java b/test/integration/goldens/pubsub/com/google/pubsub/v1/SnapshotName.java
@@ -181,8 +181,8 @@ public Builder setSnapshot(String snapshot) {
     }
 
     private Builder(SnapshotName snapshotName) {
-      project = snapshotName.project;
-      snapshot = snapshotName.snapshot;
+      this.project = snapshotName.project;
+      this.snapshot = snapshotName.snapshot;
     }
 
     public SnapshotName build() {

diff --git a/test/integration/goldens/pubsub/com/google/pubsub/v1/SubscriptionName.java b/test/integration/goldens/pubsub/com/google/pubsub/v1/SubscriptionName.java
@@ -181,8 +181,8 @@ public Builder setSubscription(String subscription) {
     }
 
     private Builder(SubscriptionName subscriptionName) {
-      project = subscriptionName.project;
-      subscription = subscriptionName.subscription;
+      this.project = subscriptionName.project;
+      this.subscription = subscriptionName.subscription;
     }
 
     public SubscriptionName build() {