test: replace getDefaultInstance with newBuilder.build (#2477)

mutianf · web-flow · commit 22f0868defa9 · 2025-02-10T16:35:56.000-05:00
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/AppProfile.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/AppProfile.java
@@ -274,7 +274,7 @@ public static MultiClusterRoutingPolicy of(Set<String> clusterIds) {
     public static MultiClusterRoutingPolicy withRowAffinity() {
       return new MultiClusterRoutingPolicy(
           MultiClusterRoutingUseAny.newBuilder()
-              .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())
+              .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())
               .build());
     }
 
@@ -294,7 +294,7 @@ public static MultiClusterRoutingPolicy withRowAffinity(Set<String> clusterIds)
       return new MultiClusterRoutingPolicy(
           MultiClusterRoutingUseAny.newBuilder()
               .addAllClusterIds(clusterIds)
-              .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())
+              .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())
               .build());
     }
 
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java
@@ -1053,7 +1053,8 @@ public void testCreateAppProfileAddRowAffinity() {
                             .newBuilder()
                             .setRowAffinity(
                                 com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                                    .RowAffinity.getDefaultInstance())))
+                                    .RowAffinity.newBuilder()
+                                    .build())))
             .build();
 
     com.google.bigtable.admin.v2.AppProfile expectedResponse =
@@ -1064,7 +1065,8 @@ public void testCreateAppProfileAddRowAffinity() {
                 com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny.newBuilder()
                     .setRowAffinity(
                         com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                            .RowAffinity.getDefaultInstance()))
+                            .RowAffinity.newBuilder()
+                            .build()))
             .build();
 
     Mockito.when(mockCreateAppProfileCallable.futureCall(expectedRequest))
@@ -1100,7 +1102,8 @@ public void testCreateAppProfileAddRowAffinityAddMultipleClusterIds() {
                             .addClusterIds("cluster-id-2")
                             .setRowAffinity(
                                 com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                                    .RowAffinity.getDefaultInstance())))
+                                    .RowAffinity.newBuilder()
+                                    .build())))
             .build();
 
     com.google.bigtable.admin.v2.AppProfile expectedResponse =
@@ -1113,7 +1116,8 @@ public void testCreateAppProfileAddRowAffinityAddMultipleClusterIds() {
                     .addClusterIds("cluster-id-2")
                     .setRowAffinity(
                         com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                            .RowAffinity.getDefaultInstance()))
+                            .RowAffinity.newBuilder()
+                            .build()))
             .build();
 
     Mockito.when(mockCreateAppProfileCallable.futureCall(expectedRequest))
@@ -1150,7 +1154,8 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
                             .addClusterIds("cluster-id-2")
                             .setRowAffinity(
                                 com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                                    .RowAffinity.getDefaultInstance())))
+                                    .RowAffinity.newBuilder()
+                                    .build())))
             .build();
 
     com.google.bigtable.admin.v2.AppProfile expectedResponse =
@@ -1163,7 +1168,8 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
                     .addClusterIds("cluster-id-2")
                     .setRowAffinity(
                         com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                            .RowAffinity.getDefaultInstance()))
+                            .RowAffinity.newBuilder()
+                            .build()))
             .build();
 
     Mockito.when(mockCreateAppProfileCallable.futureCall(expectedRequest))
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/AppProfileTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/AppProfileTest.java
@@ -303,7 +303,8 @@ public void testFromProtoWithRowAffinityNoClusterGroup() {
                     com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny.newBuilder()
                         .setRowAffinity(
                             com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                                .RowAffinity.getDefaultInstance())
+                                .RowAffinity.newBuilder()
+                                .build())
                         .build())
                 .setEtag("my-etag")
                 .build());
@@ -329,7 +330,8 @@ public void testFromProtoWithRowAffinityClusterGroup() {
                         .addAllClusterIds(ImmutableList.of("cluster-id-1", "cluster-id-2"))
                         .setRowAffinity(
                             com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
-                                .RowAffinity.getDefaultInstance())
+                                .RowAffinity.newBuilder()
+                                .build())
                         .build())
                 .setEtag("my-etag")
                 .build());
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/CreateAppProfileRequestTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/CreateAppProfileRequestTest.java
@@ -111,7 +111,7 @@ public void testRowAffinity() {
     assertThat(wrapper.toProto("my-project").getAppProfile().getMultiClusterRoutingUseAny())
         .isEqualTo(
             MultiClusterRoutingUseAny.newBuilder()
-                .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())
+                .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())
                 .build());
   }
 }
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/UpdateAppProfileRequestTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/UpdateAppProfileRequestTest.java
@@ -172,7 +172,7 @@ public void testUpdateRowAffinity() {
                         .setMultiClusterRoutingUseAny(
                             MultiClusterRoutingUseAny.newBuilder()
                                 .setRowAffinity(
-                                    MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())))
+                                    MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())))
                 .setUpdateMask(FieldMask.newBuilder().addPaths("multi_cluster_routing_use_any"))
                 .build());
   }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void testRowAffinity() {`
`111`	`111`	`assertThat(wrapper.toProto("my-project").getAppProfile().getMultiClusterRoutingUseAny())`
`112`	`112`	`.isEqualTo(`
`113`	`113`	`MultiClusterRoutingUseAny.newBuilder()`
`114`		`- .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())`
	`114`	`+ .setRowAffinity(MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())`
`115`	`115`	`.build());`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void testUpdateRowAffinity() {`
`172`	`172`	`.setMultiClusterRoutingUseAny(`
`173`	`173`	`MultiClusterRoutingUseAny.newBuilder()`
`174`	`174`	`.setRowAffinity(`
`175`		`- MultiClusterRoutingUseAny.RowAffinity.getDefaultInstance())))`
	`175`	`+ MultiClusterRoutingUseAny.RowAffinity.newBuilder().build())))`
`176`	`176`	`.setUpdateMask(FieldMask.newBuilder().addPaths("multi_cluster_routing_use_any"))`
`177`	`177`	`.build());`
`178`	`178`	`}`