Rename return types in CmekSettingsName to avoid breaking changes

Neenu1995 · Neenu1995 · commit 4a6ebdbae920 · 2021-02-02T21:12:20.000-05:00
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
@@ -63,23 +63,23 @@ private CmekSettingsName(Builder builder) {
     pathTemplate = PROJECT;
   }
 
-  private CmekSettingsName(OrganizationBuilder builder) {
+  private CmekSettingsName(OrganizationCmekSettingsBuilder builder) {
     organization = Preconditions.checkNotNull(builder.getOrganization());
     project = null;
     folder = null;
     billingAccount = null;
     pathTemplate = ORGANIZATION;
   }
 
-  private CmekSettingsName(FolderBuilder builder) {
+  private CmekSettingsName(FolderCmekSettingsBuilder builder) {
     folder = Preconditions.checkNotNull(builder.getFolder());
     project = null;
     organization = null;
     billingAccount = null;
     pathTemplate = FOLDER;
   }
 
-  private CmekSettingsName(BillingAccountBuilder builder) {
+  private CmekSettingsName(BillingAccountCmekSettingsBuilder builder) {
     billingAccount = Preconditions.checkNotNull(builder.getBillingAccount());
     project = null;
     organization = null;
@@ -113,18 +113,18 @@ public static Builder newProjectCmekSettingsBuilder() {
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static OrganizationBuilder newOrganizationCmekSettingsBuilder() {
-    return new OrganizationBuilder();
+  public static OrganizationCmekSettingsBuilder newOrganizationCmekSettingsBuilder() {
+    return new OrganizationCmekSettingsBuilder();
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static FolderBuilder newFolderCmekSettingsBuilder() {
-    return new FolderBuilder();
+  public static FolderCmekSettingsBuilder newFolderCmekSettingsBuilder() {
+    return new FolderCmekSettingsBuilder();
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static BillingAccountBuilder newBillingAccountCmekSettingsBuilder() {
-    return new BillingAccountBuilder();
+  public static BillingAccountCmekSettingsBuilder newBillingAccountCmekSettingsBuilder() {
+    return new BillingAccountCmekSettingsBuilder();
   }
 
   public Builder toBuilder() {
@@ -323,16 +323,16 @@ public CmekSettingsName build() {
 
   /** Builder for organizations/{organization}/cmekSettings. */
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static class OrganizationBuilder {
+  public static class OrganizationCmekSettingsBuilder {
     private String organization;
 
-    protected OrganizationBuilder() {}
+    protected OrganizationCmekSettingsBuilder() {}
 
     public String getOrganization() {
       return organization;
     }
 
-    public OrganizationBuilder setOrganization(String organization) {
+    public OrganizationCmekSettingsBuilder setOrganization(String organization) {
       this.organization = organization;
       return this;
     }
@@ -344,16 +344,16 @@ public CmekSettingsName build() {
 
   /** Builder for folders/{folder}/cmekSettings. */
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static class FolderBuilder {
+  public static class FolderCmekSettingsBuilder {
     private String folder;
 
-    protected FolderBuilder() {}
+    protected FolderCmekSettingsBuilder() {}
 
     public String getFolder() {
       return folder;
     }
 
-    public FolderBuilder setFolder(String folder) {
+    public FolderCmekSettingsBuilder setFolder(String folder) {
       this.folder = folder;
       return this;
     }
@@ -365,16 +365,16 @@ public CmekSettingsName build() {
 
   /** Builder for billingAccounts/{billing_account}/cmekSettings. */
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static class BillingAccountBuilder {
+  public static class BillingAccountCmekSettingsBuilder {
     private String billingAccount;
 
-    protected BillingAccountBuilder() {}
+    protected BillingAccountCmekSettingsBuilder() {}
 
     public String getBillingAccount() {
       return billingAccount;
     }
 
-    public BillingAccountBuilder setBillingAccount(String billingAccount) {
+    public BillingAccountCmekSettingsBuilder setBillingAccount(String billingAccount) {
       this.billingAccount = billingAccount;
       return this;
     }
diff --git a/synth.py b/synth.py
@@ -30,7 +30,7 @@
       bazel_target=f'//google/{service}/{version}:google-cloud-{service}-{version}-java',
   )
 
-  # The method renamings will be removed in the next major release(lines 34 - 48)
+  # The method renamings will be removed in the next major release(lines 34 - 51)
   s.replace('**/CmekSettingsName.java', 'formatBillingAccountName', 'formatBillingAccountCmekSettingsName')
   s.replace('**/CmekSettingsName.java', 'formatFolderName', 'formatFolderCmekSettingsName')
   s.replace('**/CmekSettingsName.java', 'formatOrganizationName', 'formatOrganizationCmekSettingsName')
@@ -43,6 +43,9 @@
   s.replace('**/CmekSettingsName.java', 'ofFolderName', 'ofFolderCmekSettingsName')
   s.replace('**/CmekSettingsName.java', 'ofOrganizationName', 'ofOrganizationCmekSettingsName')
   s.replace('**/CmekSettingsName.java', 'ofProjectName', 'ofProjectCmekSettingsName')
+  s.replace('**/CmekSettingsName.java', 'BillingAccountBuilder', 'BillingAccountCmekSettingsBuilder')
+  s.replace('**/CmekSettingsName.java', 'FolderBuilder', 'FolderCmekSettingsBuilder')
+  s.replace('**/CmekSettingsName.java', 'OrganizationBuilder', 'OrganizationCmekSettingsBuilder')
   s.replace('**/ConfigClientTest.java', 'CmekSettingsName.ofProjectName', 'CmekSettingsName.ofProjectCmekSettingsName')
 
   java.format_code(f'proto-google-cloud-{service}-{version}/src')
