chore: rewrite instance API samples.

samples/snippets/src/main/java/com/example/spanner/v2/CreateInstanceWithProcessingUnitsExample.java

@@ -19,27 +19,28 @@
 //[START spanner_create_instance_with_processing_units]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.spanner.Instance;
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.InstanceConfigId;
-import com.google.cloud.spanner.InstanceId;
-import com.google.cloud.spanner.InstanceInfo;
-import com.google.cloud.spanner.Spanner;
-import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings;
 import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
+import com.google.spanner.admin.instance.v1.CreateInstanceRequest;
+import com.google.spanner.admin.instance.v1.Instance;
+import com.google.spanner.admin.instance.v1.InstanceConfigName;
+import com.google.spanner.admin.instance.v1.ProjectName;
+import java.io.IOException;
 
 class CreateInstanceWithProcessingUnitsExample {
 
-  static void createInstance() {
+  static void createInstance() throws IOException {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "my-project";
     String instanceId = "my-instance";
     createInstance(projectId, instanceId);
   }
 
-  static void createInstance(String projectId, String instanceId) {
-    Spanner spanner = SpannerOptions.newBuilder().setProjectId(projectId).build().getService();
-    InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
+  static void createInstance(String projectId, String instanceId) throws IOException {
+    InstanceAdminSettings instanceAdminSettings =
+        InstanceAdminSettings.newBuilder().setQuotaProjectId(projectId).build();
+    InstanceAdminClient instanceAdminClient = InstanceAdminClient.create(instanceAdminSettings);
 
     // Set Instance configuration.
     String configId = "regional-us-central1";
@@ -50,27 +51,33 @@ static void createInstance(String projectId, String instanceId) {
     try {
       // Creates a new instance
       System.out.printf("Creating instance %s.%n", instanceId);
-      OperationFuture<Instance, CreateInstanceMetadata> operation =
-          instanceAdminClient.createInstance(InstanceInfo
-              .newBuilder(InstanceId.of(projectId, instanceId))
-              .setInstanceConfigId(InstanceConfigId.of(projectId, configId))
-              .setProcessingUnits(processingUnits)
+      Instance instance =
+          Instance.newBuilder()
               .setDisplayName(displayName)
-              .build());
+              .setProcessingUnits(processingUnits)
+              .setConfig(
+                  InstanceConfigName.of(projectId, configId).toString())
+              .build();
+      OperationFuture<Instance, CreateInstanceMetadata> operation =
+          instanceAdminClient.createInstanceAsync(
+              CreateInstanceRequest.newBuilder()
+                  .setParent(ProjectName.of(projectId).toString())
+                  .setInstanceId(instanceId)
+                  .setInstance(instance)
+                  .build());
 
       // Wait for the createInstance operation to finish.
       System.out.printf("Waiting for operation on %s to complete...%n", instanceId);
       Instance createdInstance = operation.get();
 
-      System.out.printf("Created instance %s.%n", createdInstance.getId().getInstance());
+      System.out.printf("Created instance %s.%n", createdInstance.getName());
 
-      Instance instance = instanceAdminClient.getInstance(instanceId);
-      System.out.printf("Instance %s has %d processing units.%n", instance.getId().getInstance(),
-          instance.getProcessingUnits());
+      Instance instanceResult = instanceAdminClient.getInstance(instanceId);
+      System.out.printf("Instance %s has %d processing units.%n", instanceResult.getName(),
+          instanceResult.getProcessingUnits());
     } catch (Exception e) {
       System.out.printf("Error: %s.%n", e.getMessage());
     }
-    spanner.close();
   }
 }
 //[END spanner_create_instance_with_processing_units]

samples/snippets/src/main/java/com/example/spanner/v2/DeleteInstanceConfigSample.java

@@ -17,32 +17,35 @@
 package com.example.spanner.v2;
 
 // [START spanner_delete_instance_config]
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerException;
-import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings;
+import com.google.spanner.admin.instance.v1.DeleteInstanceConfigRequest;
+import java.io.IOException;
 
 class DeleteInstanceConfigSample {
-  static void deleteInstanceConfig() {
+  static void deleteInstanceConfig() throws IOException {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "my-project";
-    String instanceConfigId = "custom-user-config";
+    String instanceConfigId = "projects/my-project/instanceConfigs/custom-user-config";
     deleteInstanceConfig(projectId, instanceConfigId);
   }
 
-  static void deleteInstanceConfig(String projectId, String instanceConfigId) {
-    try (Spanner spanner =
-        SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
-      final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
-      try {
-        System.out.printf("Deleting %s...\n", instanceConfigId);
-        instanceAdminClient.deleteInstanceConfig(instanceConfigId);
-        System.out.printf("Deleted instance configuration %s\n", instanceConfigId);
-      } catch (SpannerException e) {
-        System.out.printf(
-            "Error: Deleting instance configuration %s failed with error message: %s\n",
-            instanceConfigId, e.getMessage());
-      }
+  static void deleteInstanceConfig(String projectId, String instanceConfigId) throws IOException {
+    final InstanceAdminSettings instanceAdminSettings =
+        InstanceAdminSettings.newBuilder().setQuotaProjectId(projectId).build();
+    final InstanceAdminClient instanceAdminClient = InstanceAdminClient.create(instanceAdminSettings);
+    final DeleteInstanceConfigRequest request =
+        DeleteInstanceConfigRequest.newBuilder().setName(instanceConfigId).build();
+
+    try {
+      System.out.printf("Deleting %s...\n", instanceConfigId);
+      instanceAdminClient.deleteInstanceConfig(request);
+      System.out.printf("Deleted instance configuration %s\n", instanceConfigId);
+    } catch (SpannerException e) {
+      System.out.printf(
+          "Error: Deleting instance configuration %s failed with error message: %s\n",
+          instanceConfigId, e.getMessage());
     }
   }
 }

samples/snippets/src/main/java/com/example/spanner/v2/GetInstanceConfigSample.java

@@ -18,37 +18,32 @@
 
 //[START spanner_get_instance_config]
 
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.InstanceConfig;
-import com.google.cloud.spanner.Spanner;
-import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings;
+import com.google.spanner.admin.instance.v1.InstanceConfig;
+import java.io.IOException;
 
 public class GetInstanceConfigSample {
 
-  static void getInstanceConfig() {
+  static void getInstanceConfig() throws IOException {
     // TODO(developer): Replace these variables before running the sample.
     final String projectId = "my-project";
     final String instanceConfigName = "nam6";
     getInstanceConfig(projectId, instanceConfigName);
   }
 
-  static void getInstanceConfig(String projectId, String instanceConfigName) {
-    try (Spanner spanner = SpannerOptions
-        .newBuilder()
-        .setProjectId(projectId)
-        .build()
-        .getService()) {
-      final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
-
-      final InstanceConfig instanceConfig = instanceAdminClient
-          .getInstanceConfig(instanceConfigName);
-
-      System.out.printf(
-          "Available leader options for instance config %s: %s%n",
-          instanceConfig.getId(),
-          instanceConfig.getLeaderOptions()
-      );
-    }
+  static void getInstanceConfig(String projectId, String instanceConfigName) throws IOException {
+    final InstanceAdminSettings instanceAdminSettings =
+        InstanceAdminSettings.newBuilder().setQuotaProjectId(projectId).build();
+    final InstanceAdminClient instanceAdminClient = InstanceAdminClient.create(instanceAdminSettings);
+
+    final InstanceConfig instanceConfig = instanceAdminClient.getInstanceConfig(instanceConfigName);
+
+    System.out.printf(
+        "Available leader options for instance config %s: %s%n",
+        instanceConfig.getName(),
+        instanceConfig.getLeaderOptionsList()
+    );
   }
 }
 //[END spanner_get_instance_config]

samples/snippets/src/main/java/com/example/spanner/v2/ListInstanceConfigOperationsSample.java

@@ -17,49 +17,47 @@
 package com.example.spanner.v2;
 
 // [START spanner_list_instance_config_operations]
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.Options;
-import com.google.cloud.spanner.Spanner;
-import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings;
 import com.google.longrunning.Operation;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.spanner.admin.instance.v1.CreateInstanceConfigMetadata;
+import com.google.spanner.admin.instance.v1.ListInstanceConfigOperationsRequest;
+import java.io.IOException;
 
 public class ListInstanceConfigOperationsSample {
-  static void listInstanceConfigOperations() {
+  static void listInstanceConfigOperations() throws IOException {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "my-project";
     listInstanceConfigOperations(projectId);
   }
 
-  static void listInstanceConfigOperations(String projectId) {
-    try (Spanner spanner =
-        SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
-      final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
+  static void listInstanceConfigOperations(String projectId) throws IOException {
+    final InstanceAdminSettings instanceAdminSettings =
+        InstanceAdminSettings.newBuilder().setQuotaProjectId(projectId).build();
+    final InstanceAdminClient instanceAdminClient =
+        InstanceAdminClient.create(instanceAdminSettings);
 
-      try {
+    try {
+      System.out.printf(
+          "Getting list of instance config operations for project %s...\n",
+          projectId);
+      final ListInstanceConfigOperationsRequest request =
+          ListInstanceConfigOperationsRequest.newBuilder().setFilter("(metadata.@type=type.googleapis.com/"
+              + "google.spanner.admin.instance.v1.CreateInstanceConfigMetadata)").build();
+      final Iterable<Operation> instanceConfigOperations =
+          instanceAdminClient.listInstanceConfigOperations(request).iterateAll();
+      for (Operation operation : instanceConfigOperations) {
+        CreateInstanceConfigMetadata metadata =
+            operation.getMetadata().unpack(CreateInstanceConfigMetadata.class);
         System.out.printf(
-            "Getting list of instance config operations for project %s...\n",
-            projectId);
-        final Iterable<Operation> instanceConfigOperations =
-            instanceAdminClient
-                .listInstanceConfigOperations(
-                    Options.filter(
-                        "(metadata.@type=type.googleapis.com/"
-                        + "google.spanner.admin.instance.v1.CreateInstanceConfigMetadata)"))
-                .iterateAll();
-        for (Operation operation : instanceConfigOperations) {
-          CreateInstanceConfigMetadata metadata =
-              operation.getMetadata().unpack(CreateInstanceConfigMetadata.class);
-          System.out.printf(
-              "Create instance config operation for %s is %d%% completed.\n",
-              metadata.getInstanceConfig().getName(), metadata.getProgress().getProgressPercent());
-        }
-      } catch (InvalidProtocolBufferException e) {
-        System.out.printf(
-            "Error: Listing instance config operations failed with error message %s\n",
-            e.getMessage());
+            "Create instance config operation for %s is %d%% completed.\n",
+            metadata.getInstanceConfig().getName(), metadata.getProgress().getProgressPercent());
       }
+    } catch (InvalidProtocolBufferException e) {
+      System.out.printf(
+          "Error: Listing instance config operations failed with error message %s\n",
+          e.getMessage());
     }
   }
 }

samples/snippets/src/main/java/com/example/spanner/v2/ListInstanceConfigsSample.java

@@ -18,34 +18,27 @@
 
 //[START spanner_list_instance_configs]
 
-import com.google.cloud.spanner.InstanceAdminClient;
-import com.google.cloud.spanner.InstanceConfig;
-import com.google.cloud.spanner.Spanner;
-import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient;
+import com.google.spanner.admin.instance.v1.InstanceConfig;
+import java.io.IOException;
 
 public class ListInstanceConfigsSample {
 
-  static void listInstanceConfigs() {
+  static void listInstanceConfigs() throws IOException {
     // TODO(developer): Replace these variables before running the sample.
     final String projectId = "my-project";
     listInstanceConfigs(projectId);
   }
 
-  static void listInstanceConfigs(String projectId) {
-    try (Spanner spanner = SpannerOptions
-        .newBuilder()
-        .setProjectId(projectId)
-        .build()
-        .getService()) {
-      final InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
-
-      for (InstanceConfig instanceConfig : instanceAdminClient.listInstanceConfigs().iterateAll()) {
-        System.out.printf(
-            "Available leader options for instance config %s: %s%n",
-            instanceConfig.getId(),
-            instanceConfig.getLeaderOptions()
-        );
-      }
+  static void listInstanceConfigs(String projectId) throws IOException {
+    final InstanceAdminClient instanceAdminClient = InstanceAdminClient.create();
+    for (InstanceConfig instanceConfig :
+        instanceAdminClient.listInstanceConfigs(projectId).iterateAll()) {
+      System.out.printf(
+          "Available leader options for instance config %s: %s%n",
+          instanceConfig.getName(),
+          instanceConfig.getLeaderOptionsList()
+      );
     }
   }
 }