Fixed code following the comments

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/disks/StartDiskReplication.java

@@ -57,8 +57,6 @@ public static Operation.Status startDiskAsyncReplication(String primaryProjectId
         throws IOException, ExecutionException, InterruptedException {
     String secondaryDiskPath = String.format("projects/%s/regions/%s/disks/%s",
             secondaryProjectId, secondaryDiskLocation, secondaryDiskName);
-    // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests.
 
     // Uncomment these lines if your disk has zonal location.
     // try (DisksClient disksClient = DisksClient.create()) {
@@ -67,6 +65,8 @@ public static Operation.Status startDiskAsyncReplication(String primaryProjectId
     //        .setAsyncSecondaryDisk(secondaryDiskPath)
     //       .build();
 
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
     try (RegionDisksClient disksClient = RegionDisksClient.create()) {
 
       RegionDisksStartAsyncReplicationRequest replicationRequest =
@@ -78,7 +78,7 @@ public static Operation.Status startDiskAsyncReplication(String primaryProjectId
               primaryProjectId, primaryDiskLocation, primaryDiskName, replicationRequest).get();
 
       if (response.hasError()) {
-        System.out.println(response.getError());
+        System.out.printf("Error starting disk replication: %s%n", response.getError());
         return null;
       }
       return response.getStatus();

compute/cloud-client/src/main/java/compute/disks/StopDiskReplication.java

@@ -43,18 +43,18 @@ public static void main(String[] args)
   public static Operation.Status stopDiskAsyncReplication(
         String project, String diskLocation, String diskName)
         throws IOException, ExecutionException, InterruptedException {
-    // Initialize client that will be used to send requests. This client only needs to be created
-    // once, and can be reused for multiple requests.
 
     // Uncomment this line if your disk has zonal location.
     //try (DisksClient disksClient = DisksClient.create()) {
 
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
     try (RegionDisksClient disksClient = RegionDisksClient.create()) {
       Operation response = disksClient.stopAsyncReplicationAsync(
               project, diskLocation, diskName).get();
 
       if (response.hasError()) {
-        System.out.println(response.getError());
+        System.out.printf("Error stopping disk replication: %s%n", response.getError());
         return null;
       }
       return response.getStatus();

compute/cloud-client/src/main/java/compute/disks/consistencygroup/AddDiskToConsistencyGroup.java

@@ -60,14 +60,16 @@ public static Operation.Status addDiskToConsistencyGroup(
     //        AddResourcePoliciesDiskRequest request =
     //            AddResourcePoliciesDiskRequest.newBuilder()
     //                .setDisk(diskName)
+    //                .setZone(location)
+    //                .setProject(project)
     //                .setDisksAddResourcePoliciesRequestResource(
     //                    DisksAddResourcePoliciesRequest.newBuilder()
     //                        .addAllResourcePolicies(Arrays.asList(consistencyGroupUrl))
     //                        .build())
-    //                .setProject(project)
-    //                .setZone(location)
     //                .build();
 
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
     try (RegionDisksClient disksClient = RegionDisksClient.create()) {
       AddResourcePoliciesRegionDiskRequest disksRequest =
           AddResourcePoliciesRegionDiskRequest.newBuilder()

compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneDisksFromConsistencyGroup.java

@@ -54,30 +54,24 @@ public static Operation.Status cloneDisksFromConsistencyGroup(String project,
     String sourceConsistencyGroupPolicy = String.format(
             "projects/%s/regions/%s/resourcePolicies/%s", project, consistencyGroupLocation,
             consistencyGroupName);
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
 
-    // If your disk has zonal location uncomment this code
+    // Use this client if your disk has zonal location.
     //try (DisksClient disksClient = DisksClient.create()){
-    //  BulkInsertDiskRequest request = BulkInsertDiskRequest.newBuilder()
-    //    .setProject(project)
-    //    .setZone(disksLocation)
-    //    .setBulkInsertDiskResourceResource(
-    //        BulkInsertDiskResource.newBuilder()
-    //            .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
-    //            .build())
-    //    .build();
-    //Operation response = disksClient.bulkInsertAsync(request).get(3, TimeUnit.MINUTES);
-
-    try (RegionDisksClient regionDisksClient = RegionDisksClient.create()) {
+    try (RegionDisksClient disksClient = RegionDisksClient.create()) {
       BulkInsertRegionDiskRequest request = BulkInsertRegionDiskRequest.newBuilder()
           .setProject(project)
           .setRegion(disksLocation)
+          // Set the zone if your disk has zonal location instead of region.
+          // .setZone(disksLocation)
           .setBulkInsertDiskResourceResource(
               BulkInsertDiskResource.newBuilder()
                   .setSourceConsistencyGroupPolicy(sourceConsistencyGroupPolicy)
                   .build())
           .build();
 
-      Operation response = regionDisksClient.bulkInsertAsync(request).get(3, TimeUnit.MINUTES);
+      Operation response = disksClient.bulkInsertAsync(request).get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
         System.out.printf("Error cloning disks: %s%n", response.getError());

compute/cloud-client/src/main/java/compute/disks/consistencygroup/DeleteDiskConsistencyGroup.java

@@ -43,8 +43,8 @@ public static Operation.Status deleteDiskConsistencyGroup(
       throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
-    try (ResourcePoliciesClient regionResourcePoliciesClient = ResourcePoliciesClient.create()) {
-      Operation response = regionResourcePoliciesClient
+    try (ResourcePoliciesClient resourcePoliciesClient = ResourcePoliciesClient.create()) {
+      Operation response = resourcePoliciesClient
           .deleteAsync(project, region, consistencyGroupName).get();
 
       if (response.hasError()) {

compute/cloud-client/src/main/java/compute/disks/consistencygroup/RemoveDiskFromConsistencyGroup.java

@@ -61,14 +61,16 @@ public static Operation.Status removeDiskFromConsistencyGroup(
     //        RemoveResourcePoliciesDiskRequest request =
     //            RemoveResourcePoliciesDiskRequest.newBuilder()
     //                .setDisk(diskName)
+    //                .setZone(location)
+    //                .setProject(project)
     //                .setDisksRemoveResourcePoliciesRequestResource(
     //                    DisksRemoveResourcePoliciesRequest.newBuilder()
     //                        .addAllResourcePolicies(Arrays.asList(consistencyGroupUrl))
     //                        .build())
-    //                .setProject(project)
-    //                .setZone(location)
     //                .build();
 
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
     try (RegionDisksClient disksClient = RegionDisksClient.create()) {
       RemoveResourcePoliciesRegionDiskRequest disksRequest =
               RemoveResourcePoliciesRegionDiskRequest.newBuilder()