Fixed code following the comments

Author: TetyanaYahodska

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

@@ -95,7 +95,7 @@ public static Disk createDiskSecondaryRegional(String projectId, String secondar
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println(response.getError());
+        System.out.printf("Error creating disk: %s%n", response.getError());
         return null;
       }
       return disksClient.get(secondaryProjectId, secondaryDiskRegion, secondaryDiskName);

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

@@ -18,7 +18,6 @@
 
 // [START compute_consistency_group_add_disk]
 import com.google.cloud.compute.v1.AddResourcePoliciesRegionDiskRequest;
-import com.google.cloud.compute.v1.Disk;
 // If your disk has zonal location uncomment these lines
 //import com.google.cloud.compute.v1.AddResourcePoliciesDiskRequest;
 //import com.google.cloud.compute.v1.DisksAddResourcePoliciesRequest;
@@ -49,7 +48,7 @@ public static void main(String[] args)
   }
 
   // Adds a disk to a Consistency Group.
-  public static Disk addDiskToConsistencyGroup(
+  public static Operation.Status addDiskToConsistencyGroup(
         String project, String location, String diskName,
         String consistencyGroupName, String consistencyGroupLocation)
         throws IOException, ExecutionException, InterruptedException {
@@ -83,9 +82,10 @@ public static Disk addDiskToConsistencyGroup(
 
       Operation response = disksClient.addResourcePoliciesAsync(disksRequest).get();
       if (response.hasError()) {
+        System.out.printf("Error adding disk to consistency group: %s%n", response.getError());
         return null;
       }
-      return disksClient.get(project, location, diskName);
+      return response.getStatus();
     }
   }
 }

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

@@ -48,8 +48,8 @@ public static void main(String[] args)
   }
 
   // Clones disks from a consistency group.
-  public static void cloneDisksFromConsistencyGroup(String project, String disksLocation,
-      String consistencyGroupName, String consistencyGroupLocation)
+  public static Operation.Status cloneDisksFromConsistencyGroup(String project,
+      String disksLocation, String consistencyGroupName, String consistencyGroupLocation)
       throws IOException, InterruptedException, ExecutionException, TimeoutException {
     String sourceConsistencyGroupPolicy = String.format(
             "projects/%s/regions/%s/resourcePolicies/%s", project, consistencyGroupLocation,
@@ -81,9 +81,9 @@ public static void cloneDisksFromConsistencyGroup(String project, String disksLo
 
       if (response.hasError()) {
         System.out.printf("Error cloning disks: %s%n", response.getError());
-        return;
+        return null;
       }
-      System.out.printf("Disks cloned from consistency group: %s\n", consistencyGroupName);
+      return response.getStatus();
     }
   }
 }

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

@@ -40,7 +40,7 @@ public static void main(String[] args)
 
   // Creates a new disk consistency group resource policy in the specified project and region.
   // Return a link to the consistency group.
-  public static String createDiskConsistencyGroup(
+  public static Operation.Status createDiskConsistencyGroup(
       String project, String region, String consistencyGroupName)
       throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
@@ -58,9 +58,10 @@ public static String createDiskConsistencyGroup(
           regionResourcePoliciesClient.insertAsync(project, region, resourcePolicy).get();
 
       if (response.hasError()) {
+        System.out.printf("Error creating consistency group: %s%n", response.getError());
         return null;
       }
-      return regionResourcePoliciesClient.get(project, region, consistencyGroupName).getSelfLink();
+      return response.getStatus();
     }
   }
 }

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

@@ -38,7 +38,7 @@ public static void main(String[] args)
   }
 
   // Deletes a disk consistency group resource policy in the specified project and region.
-  public static void deleteDiskConsistencyGroup(
+  public static Operation.Status deleteDiskConsistencyGroup(
       String project, String region, String consistencyGroupName)
       throws IOException, ExecutionException, InterruptedException {
     // Initialize client that will be used to send requests. This client only needs to be created
@@ -48,11 +48,10 @@ public static void deleteDiskConsistencyGroup(
           .deleteAsync(project, region, consistencyGroupName).get();
 
       if (response.hasError()) {
-        return;
+        System.out.printf("Error deleting disk: %s%n", response.getError());
+        return null;
       }
-      System.out.println(
-          "Disk consistency group resource policy deleted successfully: "
-              + consistencyGroupName);
+      return response.getStatus();
     }
   }
 }

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

@@ -17,7 +17,6 @@
 package compute.disks.consistencygroup;
 
 // [START compute_consistency_group_remove_disk]
-import com.google.cloud.compute.v1.Disk;
 import com.google.cloud.compute.v1.Operation;
 import com.google.cloud.compute.v1.RegionDisksClient;
 import com.google.cloud.compute.v1.RegionDisksRemoveResourcePoliciesRequest;
@@ -50,7 +49,7 @@ public static void main(String[] args)
   }
 
   // Removes a disk from a Consistency Group.
-  public static Disk removeDiskFromConsistencyGroup(
+  public static Operation.Status removeDiskFromConsistencyGroup(
         String project, String location, String diskName,
         String consistencyGroupName, String consistencyGroupLocation)
         throws IOException, ExecutionException, InterruptedException {
@@ -84,9 +83,10 @@ public static Disk removeDiskFromConsistencyGroup(
 
       Operation response = disksClient.removeResourcePoliciesAsync(disksRequest).get();
       if (response.hasError()) {
+        System.out.printf("Error removing disk from consistency group: %s%n", response.getError());
         return null;
       }
-      return disksClient.get(project, location, diskName);
+      return response.getStatus();
     }
   }
 }

compute/cloud-client/src/test/java/compute/disks/ConsistencyGroupIT.java

@@ -18,17 +18,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertNotNull;
 
-import com.google.cloud.compute.v1.Disk;
+import com.google.cloud.compute.v1.Operation;
 import compute.Util;
 import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
 import compute.disks.consistencygroup.CloneDisksFromConsistencyGroup;
 import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
 import compute.disks.consistencygroup.DeleteDiskConsistencyGroup;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -103,30 +100,26 @@ public static void cleanUp()
   @Order(1)
   public void testCreateDiskConsistencyGroupResourcePolicy()
       throws IOException, ExecutionException, InterruptedException {
-    String consistencyGroupLink = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
+    Operation.Status status = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
             PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
 
-    assertNotNull(consistencyGroupLink);
-    assertThat(consistencyGroupLink.contains(CONSISTENCY_GROUP_NAME));
+    assertThat(status).isEqualTo(Operation.Status.DONE);
   }
 
   @Test
   @Order(2)
   public void testAddRegionalDiskToConsistencyGroup()
           throws IOException, ExecutionException, InterruptedException {
-    Disk disk = AddDiskToConsistencyGroup.addDiskToConsistencyGroup(
+    Operation.Status status = AddDiskToConsistencyGroup.addDiskToConsistencyGroup(
             PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME, REGION);
 
-    assertNotNull(disk);
-    assertThat(disk.getResourcePoliciesList().get(0).contains(CONSISTENCY_GROUP_NAME));
+    assertThat(status).isEqualTo(Operation.Status.DONE);
   }
 
   @Test
   @Order(3)
   public void testCloneDisksFromConsistencyGroup()
           throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
-    System.setOut(new PrintStream(stdOut));
     CreateDiskSecondaryRegional.createDiskSecondaryRegional(
             PROJECT_ID, PROJECT_ID, DISK_NAME, SECONDARY_REGIONAL_DISK,
             REGION, REGION_SECONDARY, DISK_SIZE);
@@ -138,12 +131,9 @@ public void testCloneDisksFromConsistencyGroup()
             SECONDARY_REGIONAL_DISK, CONSISTENCY_GROUP_SECONDARY, REGION_SECONDARY);
     TimeUnit.MINUTES.sleep(1);
 
-    CloneDisksFromConsistencyGroup.cloneDisksFromConsistencyGroup(
+    Operation.Status status = CloneDisksFromConsistencyGroup.cloneDisksFromConsistencyGroup(
             PROJECT_ID, REGION_SECONDARY, CONSISTENCY_GROUP_SECONDARY, REGION_SECONDARY);
 
-    assertThat(stdOut.toString()).contains("Disks cloned from consistency group: ");
-
-    stdOut.close();
+    assertThat(status).isEqualTo(Operation.Status.DONE);
   }
-
 }