From ca73a109fb57b48f8f99924f325ed4a0c94c1271 Mon Sep 17 00:00:00 2001
From: Hanzhen Yi <hzyi@google.com>
Date: Tue, 27 Nov 2018 16:13:17 +0800
Subject: [PATCH] format

---
 .../com/google/cloud/spanner/SpannerImpl.java | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
index ff5a0f481958..e45d3ca4c3ad 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -452,7 +452,7 @@ public OperationFuture<Database, CreateDatabaseMetadata> createDatabase(
       String createStatement = "CREATE DATABASE `" + databaseId + "`";
       OperationFuture<com.google.spanner.admin.database.v1.Database, CreateDatabaseMetadata>
           rawOperationFuture = rpc.createDatabase(instanceName, createStatement, statements);
-      return new OperationFutureImpl(
+      return new OperationFutureImpl<Database, CreateDatabaseMetadata>(
           rawOperationFuture.getPollingFuture(),
           rawOperationFuture.getInitialFuture(),
           new ApiFunction<OperationSnapshot, Database>() {
@@ -498,19 +498,20 @@ public OperationFuture<Void, UpdateDatabaseDdlMetadata> updateDatabaseDdl(
       final String opId = operationId != null ? operationId : randomOperationId();
       OperationFuture<Empty, UpdateDatabaseDdlMetadata> rawOperationFuture =
           rpc.updateDatabaseDdl(dbName, statements, opId);
-      return new OperationFutureImpl(
+      return new OperationFutureImpl<Void, UpdateDatabaseDdlMetadata>(
           rawOperationFuture.getPollingFuture(),
           rawOperationFuture.getInitialFuture(),
           new ApiFunction<OperationSnapshot, Void>() {
             @Override
             public Void apply(OperationSnapshot snapshot) {
+              ProtoOperationTransformers.ResponseTransformer.create(Empty.class).apply(snapshot);
               return null;
             }
           },
           ProtoOperationTransformers.MetadataTransformer.create(UpdateDatabaseDdlMetadata.class),
-          new ApiFunction<Exception, Database>() {
+          new ApiFunction<Exception, Void>() {
             @Override
-            public Database apply(Exception e) {
+            public Void apply(Exception e) {
               throw SpannerExceptionFactory.newSpannerException(e);
             }
           });
@@ -799,12 +800,12 @@ public Timestamp writeAtLeastOnce(Iterable<Mutation> mutations) throws SpannerEx
       Mutation.toProto(mutations, mutationsProto);
       final CommitRequest request =
           CommitRequest.newBuilder()
-          .setSession(name)
-          .addAllMutations(mutationsProto)
-          .setSingleUseTransaction(
-              TransactionOptions.newBuilder()
-              .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()))
-          .build();
+              .setSession(name)
+              .addAllMutations(mutationsProto)
+              .setSingleUseTransaction(
+                  TransactionOptions.newBuilder()
+                      .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()))
+              .build();
       Span span = tracer.spanBuilder(COMMIT).startSpan();
       try (Scope s = tracer.withSpan(span)) {
         CommitResponse response =
@@ -894,11 +895,11 @@ ByteString beginTransaction() {
       try (Scope s = tracer.withSpan(span)) {
         final BeginTransactionRequest request =
             BeginTransactionRequest.newBuilder()
-            .setSession(name)
-            .setOptions(
-                TransactionOptions.newBuilder()
-                .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()))
-            .build();
+                .setSession(name)
+                .setOptions(
+                    TransactionOptions.newBuilder()
+                        .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()))
+                .build();
         Transaction txn =
             runWithRetries(
                 new Callable<Transaction>() {
@@ -1103,7 +1104,7 @@ CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken
             }
           };
       return new GrpcResultSet(stream, this, queryMode);
-    } 
+    }
 
     /**
      * Called before any read or query is started to perform state checks and initializations.
@@ -1649,7 +1650,7 @@ public com.google.spanner.v1.ResultSet call() throws Exception {
       }
       // For standard DML, using the exact row count.
       return resultSet.getStats().getRowCountExact();
-    } 
+    }
   }
 
   /**
@@ -2792,7 +2793,7 @@ ResultSetMetadata getMetadata() throws SpannerException {
      * results will return null.
      */
     @Nullable
-    ResultSetStats getStats() { 
+    ResultSetStats getStats() {
       return statistics;
     }