Spanner gapic migration

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
 
 /**
@@ -51,7 +52,7 @@ public Database reload() throws SpannerException {
    *     one. This must be unique within a database abd must be a valid identifier
    *     [a-zA-Z][a-zA-Z0-9_]*.
    */
-  public Operation<Void, UpdateDatabaseDdlMetadata> updateDdl(
+  public OperationFuture<Void, UpdateDatabaseDdlMetadata> updateDdl(
       Iterable<String> statements, String operationId) throws SpannerException {
     return dbClient.updateDatabaseDdl(instance(), database(), statements, operationId);
   }

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.Page;
 import com.google.cloud.spanner.Options.ListOption;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
@@ -58,7 +59,7 @@ public interface DatabaseAdminClient {
    * @param statements DDL statements to run while creating the database, for example {@code CREATE
    *     TABLE MyTable ( ... )}. This should not include {@code CREATE DATABASE} statement.
    */
-  Operation<Database, CreateDatabaseMetadata> createDatabase(
+  OperationFuture<Database, CreateDatabaseMetadata> createDatabase(
       String instanceId, String databaseId, Iterable<String> statements) throws SpannerException;
 
   /** 
@@ -97,7 +98,7 @@ Operation<Database, CreateDatabaseMetadata> createDatabase(
    *     one. This must be unique within a database abd must be a valid identifier
    *     [a-zA-Z][a-zA-Z0-9_]*.
    */
-  Operation<Void, UpdateDatabaseDdlMetadata> updateDatabaseDdl(
+  OperationFuture<Void, UpdateDatabaseDdlMetadata> updateDatabaseDdl(
       String instanceId,
       String databaseId,
       Iterable<String> statements,

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.Page;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
 import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata;
@@ -104,7 +105,7 @@ public void delete() {
     instanceClient.deleteInstance(instanceId());
   }
 
-  public Operation<Instance, UpdateInstanceMetadata> update(
+  public OperationFuture<Instance, UpdateInstanceMetadata> update(
       InstanceInfo.InstanceField... fieldsToUpdate) {
     return instanceClient.updateInstance(this, fieldsToUpdate);
   }
@@ -125,7 +126,7 @@ public Database getDatabase(String databaseId) {
    * @param statements DDL statements to run while creating the database, for example {@code CREATE
    *     TABLE MyTable ( ... )}. This should not include {@code CREATE DATABASE} statement.
    */
-  public Operation<Database, CreateDatabaseMetadata> createDatabase(
+  public OperationFuture<Database, CreateDatabaseMetadata> createDatabase(
       String databaseId, Iterable<String> statements) throws SpannerException {
     return dbClient.createDatabase(instanceId(), databaseId, statements);
   }

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.Page;
 import com.google.cloud.spanner.Options.ListOption;
 import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
@@ -90,7 +91,7 @@ public interface InstanceAdminClient {
    * }</pre>
    * <!--SNIPPET instance_admin_client_create_instance-->
    */
-  Operation<Instance, CreateInstanceMetadata> createInstance(InstanceInfo instance)
+  OperationFuture<Instance, CreateInstanceMetadata> createInstance(InstanceInfo instance)
       throws SpannerException;
 
   /** Gets an instance. */
@@ -186,7 +187,7 @@ Operation<Instance, CreateInstanceMetadata> createInstance(InstanceInfo instance
    * }</pre>
    * <!--SNIPPET instance_admin_client_update_instance-->
    */
-  Operation<Instance, UpdateInstanceMetadata> updateInstance(
+  OperationFuture<Instance, UpdateInstanceMetadata> updateInstance(
       InstanceInfo instance, InstanceInfo.InstanceField... fieldsToUpdate);
 
   /** Returns a builder for {@code Instance} object with the given id. */