---

schmidt-sebastian · pongad · commit b55686c653e7 · 2018-04-26T17:51:17.000-07:00
yaml --- r: 9415 b: refs/heads/spanner-gapic-migration c: 0097ffa h: refs/heads/master i: 9413: 1c43b60 9411: 4669b76 9407: ff85fcf
diff --git a/[refs] b/[refs]
@@ -80,7 +80,7 @@ refs/tags/v0.34.0: bf31760a31a66acb239322a70dcd03dbe1d0c7ca
 refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
 refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
 refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
-refs/heads/spanner-gapic-migration: 87b19d669c988a892dc32ee0af6370fcde9dd77e
+refs/heads/spanner-gapic-migration: 0097ffa5fc1e1fe590c1c5e9e2a4b7c458a944d5
 refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
 refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
 refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec
diff --git a/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
@@ -147,13 +147,9 @@ public void onNext(BatchGetDocumentsResponse response) {
 
             numResponses++;
             if (numResponses == 1) {
-              tracer
-                  .getCurrentSpan()
-                  .addAnnotation("Firestore.BatchGet: First response");
+              tracer.getCurrentSpan().addAnnotation("Firestore.BatchGet: First response");
             } else if (numResponses % 100 == 0) {
-              tracer
-                  .getCurrentSpan()
-                  .addAnnotation("Firestore.BatchGet: Received 100 responses");
+              tracer.getCurrentSpan().addAnnotation("Firestore.BatchGet: Received 100 responses");
             }
 
             switch (response.getResultCase()) {
diff --git a/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -924,7 +924,8 @@ private void stream(
       request.setTransaction(transactionId);
     }
 
-    Tracing.getTracer().getCurrentSpan()
+    Tracing.getTracer()
+        .getCurrentSpan()
         .addAnnotation(
             "Firestore.Query: Start",
             ImmutableMap.of(
@@ -940,13 +941,13 @@ private void stream(
           public void onNext(RunQueryResponse response) {
             if (!firstResponse) {
               firstResponse = true;
-              Tracing.getTracer().getCurrentSpan()
-                  .addAnnotation("Firestore.Query: First response");
+              Tracing.getTracer().getCurrentSpan().addAnnotation("Firestore.Query: First response");
             }
             if (response.hasDocument()) {
               numDocuments++;
               if (numDocuments % 100 == 0) {
-                Tracing.getTracer().getCurrentSpan()
+                Tracing.getTracer()
+                    .getCurrentSpan()
                     .addAnnotation("Firestore.Query: Received 100 documents");
               }
               Document document = response.getDocument();
@@ -970,12 +971,12 @@ public void onError(Throwable throwable) {
 
           @Override
           public void onCompleted() {
-            Tracing.getTracer().getCurrentSpan()
+            Tracing.getTracer()
+                .getCurrentSpan()
                 .addAnnotation(
                     "Firestore.Query: Completed",
                     ImmutableMap.of(
-                        "numDocuments",
-                        AttributeValue.longAttributeValue(numDocuments)));
+                        "numDocuments", AttributeValue.longAttributeValue(numDocuments)));
             documentObserver.onCompleted(readTime);
           }
         };
diff --git a/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/branches/spanner-gapic-migration/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
@@ -578,9 +578,11 @@ private T performDelete(
 
   /** Commit the current batch. */
   ApiFuture<List<WriteResult>> commit(@Nullable ByteString transactionId) {
-    Tracing.getTracer().getCurrentSpan().addAnnotation(
-        "CloudFirestore.Commit",
-        ImmutableMap.of("numDocuments", AttributeValue.longAttributeValue(mutations.size())));
+    Tracing.getTracer()
+        .getCurrentSpan()
+        .addAnnotation(
+            "CloudFirestore.Commit",
+            ImmutableMap.of("numDocuments", AttributeValue.longAttributeValue(mutations.size())));
 
     final CommitRequest.Builder request = CommitRequest.newBuilder();
     request.setDatabase(firestore.getDatabaseName());
diff --git a/branches/spanner-gapic-migration/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java b/branches/spanner-gapic-migration/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
@@ -536,16 +536,16 @@ public void getResult() throws Exception {
     Iterator<DocumentChange> changeIterator = result.getDocumentChanges().iterator();
 
     DocumentChange documentChange = changeIterator.next();
-    assertEquals("doc1",documentChange.getDocument().getId());
-    assertEquals(DocumentChange.Type.ADDED,documentChange.getType());
-    assertEquals(-1,documentChange.getOldIndex());
-    assertEquals(0,documentChange.getNewIndex());
+    assertEquals("doc1", documentChange.getDocument().getId());
+    assertEquals(DocumentChange.Type.ADDED, documentChange.getType());
+    assertEquals(-1, documentChange.getOldIndex());
+    assertEquals(0, documentChange.getNewIndex());
 
     documentChange = changeIterator.next();
-    assertEquals("doc2",documentChange.getDocument().getId());
-    assertEquals(DocumentChange.Type.ADDED,documentChange.getType());
-    assertEquals(-1,documentChange.getOldIndex());
-    assertEquals(1,documentChange.getNewIndex());
+    assertEquals("doc2", documentChange.getDocument().getId());
+    assertEquals(DocumentChange.Type.ADDED, documentChange.getType());
+    assertEquals(-1, documentChange.getOldIndex());
+    assertEquals(1, documentChange.getNewIndex());
 
     assertFalse(changeIterator.hasNext());
 
