Fixed code following recommendations

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/reservation/CreateInstanceNotConsumeReservation.java renamed to compute/cloud-client/src/main/java/compute/reservation/CreateInstanceWithoutConsumingReservation.java

@@ -33,7 +33,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class CreateInstanceNotConsumeReservation {
+public class CreateInstanceWithoutConsumingReservation {
   public static void main(String[] args)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // TODO(developer): Replace these variables before running the sample.
@@ -43,27 +43,29 @@ public static void main(String[] args)
     String zone = "us-central1-a";
     // Name of the VM instance you want to query.
     String instanceName = "YOUR_INSTANCE_NAME";
-
-    createInstanceNotConsumeReservation(projectId, zone, instanceName);
-  }
-
-  // Create a virtual machine that explicitly doesn't consume reservations
-  public static Instance createInstanceNotConsumeReservation(
-      String project, String zone, String instanceName)
-      throws IOException, InterruptedException, ExecutionException, TimeoutException {
-    // Below are sample values that can be replaced.
     // machineType: machine type of the VM being created.
     // *   This value uses the format zones/{zone}/machineTypes/{type_name}.
     // *   For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
+    String machineTypeName = "n1-standard-1";
     // sourceImage: path to the operating system image to mount.
     // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
-    // diskSizeGb: storage size of the boot disk to attach to the instance.
-    // networkName: network interface to associate with the instance.
-    String machineType = String.format("zones/%s/machineTypes/n1-standard-1", zone);
     String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
+    // diskSizeGb: storage size of the boot disk to attach to the instance.
     long diskSizeGb = 10L;
+    // networkName: network interface to associate with the instance.
     String networkName = "default";
 
+    createInstanceWithoutConsumingReservationAsync(projectId, zone, instanceName,
+        machineTypeName, sourceImage, diskSizeGb, networkName);
+  }
+
+  // Create a virtual machine that explicitly doesn't consume reservations
+  public static Instance createInstanceWithoutConsumingReservationAsync(
+      String project, String zone, String instanceName,
+      String machineTypeName, String sourceImage, long diskSizeGb, String networkName)
+      throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    String machineType = String.format("zones/%s/machineTypes/%s", zone, machineTypeName);
+
     // 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 (InstancesClient instancesClient = InstancesClient.create()) {
@@ -111,10 +113,8 @@ public static Instance createInstanceNotConsumeReservation(
       Operation response = operation.get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println("Instance creation failed ! ! " + response);
         return null;
       }
-      System.out.println("Operation Status: " + response.getStatus());
       return instancesClient.get(project, zone, instanceName);
     }
   }

compute/cloud-client/src/main/java/compute/reservation/CreateTemplateNotConsumeReservation.java renamed to compute/cloud-client/src/main/java/compute/reservation/CreateTemplateWithoutConsumingReservation.java

@@ -34,28 +34,29 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public class CreateTemplateNotConsumeReservation {
+public class CreateTemplateWithoutConsumingReservation {
   public static void main(String[] args)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // TODO(developer): Replace these variables before running the sample.
     // Project ID or project number of the Cloud project you want to use.
     String projectId = "YOUR_PROJECT_ID";
     // Name of the template you want to query.
     String templateName = "YOUR_INSTANCE_TEMPLATE_NAME";
+    String machineType = "e2-standard-4";
+    String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
 
-    createTemplateNotConsumeReservation(projectId, templateName);
+    createTemplateWithoutConsumingReservationAsync(
+        projectId, templateName, machineType, sourceImage);
   }
 
 
   // Create a template that explicitly doesn't consume any reservations.
-  public static InstanceTemplate createTemplateNotConsumeReservation(
-      String projectId, String templateName)
+  public static InstanceTemplate createTemplateWithoutConsumingReservationAsync(
+      String projectId, String templateName, String machineType, String sourceImage)
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // 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 (InstanceTemplatesClient instanceTemplatesClient = InstanceTemplatesClient.create()) {
-
-      String machineType = "e2-standard-4";
-      String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
-
       AttachedDisk attachedDisk = AttachedDisk.newBuilder()
           .setInitializeParams(AttachedDiskInitializeParams.newBuilder()
               .setSourceImage(sourceImage)
@@ -100,11 +101,8 @@ public static InstanceTemplate createTemplateNotConsumeReservation(
           .get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
-        System.out.println("Instance Template creation failed ! ! " + response);
         return null;
       }
-      System.out.printf("Instance Template Operation Status %s: %s",
-          templateName, response.getStatus());
       return instanceTemplatesClient.get(projectId, templateName);
     }
   }

compute/cloud-client/src/test/java/compute/reservation/ConsumeReservationIT.java

@@ -21,11 +21,8 @@
 
 import com.google.cloud.compute.v1.Instance;
 import com.google.cloud.compute.v1.InstanceTemplate;
-import com.google.cloud.compute.v1.InstanceTemplatesClient;
-import com.google.cloud.compute.v1.InstancesClient;
 import compute.DeleteInstance;
 import compute.DeleteInstanceTemplate;
-import compute.Util;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -45,15 +42,14 @@ public class ConsumeReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-central1-a";
-  private static InstancesClient instancesClient;
-  private static InstanceTemplatesClient instanceTemplatesClient;
-  static String javaVersion = System.getProperty("java.version").substring(0, 2);
   private static final String INSTANCE_NOT_CONSUME_RESERVATION_NAME =
-      "test-instance-not-consume-"  + javaVersion  + "-"
-          + UUID.randomUUID().toString().substring(0, 8);
+      "test-instance-not-consume-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String TEMPLATE_NOT_CONSUME_RESERVATION_NAME =
-      "test-template-not-consume-"  + javaVersion  + "-"
-      + UUID.randomUUID().toString().substring(0, 8);
+      "test-template-not-consume-"  + UUID.randomUUID().toString().substring(0, 8);
+  private static final String MACHINE_TYPE_NAME = "n1-standard-1";
+  private static final String SOURCE_IMAGE = "projects/debian-cloud/global/images/family/debian-11";
+  private static final String NETWORK_NAME = "default";
+  private static final long DISK_SIZE_GD = 10L;
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -66,14 +62,6 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-
-    // Initialize clients once for all tests
-    instancesClient = InstancesClient.create();
-    instanceTemplatesClient = InstanceTemplatesClient.create();
-
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingInstances("test-instance-not-consume-"  + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingInstanceTemplates("test-template-not-consume-"  + javaVersion, PROJECT_ID);
   }
 
   @AfterAll
@@ -83,17 +71,15 @@ public static void cleanup()
     DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
     DeleteInstanceTemplate.deleteInstanceTemplate(
         PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
-
-    // Close clients after all tests
-    instancesClient.close();
-    instanceTemplatesClient.close();
   }
 
   @Test
   public void testCreateInstanceNotConsumeReservation()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    Instance instance = CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
-            PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
+    Instance instance = CreateInstanceWithoutConsumingReservation
+        .createInstanceWithoutConsumingReservationAsync(
+            PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE_NAME,
+        SOURCE_IMAGE, DISK_SIZE_GD, NETWORK_NAME);
 
     Assertions.assertNotNull(instance);
     Assertions.assertEquals(NO_RESERVATION.toString(),
@@ -104,8 +90,9 @@ public void testCreateInstanceNotConsumeReservation()
   public void testCreateTemplateNotConsumeReservation()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     InstanceTemplate template =
-        CreateTemplateNotConsumeReservation.createTemplateNotConsumeReservation(
-        PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
+        CreateTemplateWithoutConsumingReservation.createTemplateWithoutConsumingReservationAsync(
+        PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME,
+            MACHINE_TYPE_NAME, SOURCE_IMAGE);
 
     Assertions.assertNotNull(template);
     Assertions.assertEquals(NO_RESERVATION.toString(),