---

elisheva-qlogic · sduskis · commit 29f058e56fce · 2019-01-25T13:26:28.000-05:00
yaml --- r: 18103 b: refs/heads/pubsub-ordering-keys c: b92a48b h: refs/heads/master i: 18101: 7925072 18099: dc0f9d3 18095: 524f133
diff --git a/[refs] b/[refs]
@@ -159,7 +159,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 9c47e1b4ff84f5ac07b0b38848e662c0e7eb3dad
+refs/heads/pubsub-ordering-keys: b92a48b90f0f6b5b0749afe30523a9097958229b
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java
@@ -185,7 +185,8 @@ public Void call() {
 
       // Handle RPC level errors by wrapping them in a MutateRowsException
       ApiFuture<List<MutateRowsResponse>> catching =
-          ApiFutures.catching(innerFuture, Throwable.class, attemptFailedCallback);
+          ApiFutures.catching(
+              innerFuture, Throwable.class, attemptFailedCallback, MoreExecutors.directExecutor());
 
       // Inspect the results and either propagate the success, or prepare to retry the failed
       // mutations
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java
@@ -172,10 +172,8 @@ private void waitForPort(int port) throws InterruptedException, TimeoutException
   }
 
   private ManagedChannel createChannel(int port) {
-    // NOTE: usePlaintext is currently @ExperimentalAPI. In grpc 1.11 it be became parameterless.
-    // In 1.12 it should be stable. See https://github.com/grpc/grpc-java/issues/1772 for discussion
     return ManagedChannelBuilder.forAddress("localhost", port)
-        .usePlaintext(true)
+        .usePlaintext()
         .maxInboundMessageSize(256 * 1024 * 1024)
         .build();
   }
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -349,7 +349,8 @@ private static String getActiveGoogleCloudConfig(File configDir) {
     String activeGoogleCloudConfig = null;
     try {
       activeGoogleCloudConfig =
-          Files.readFirstLine(new File(configDir, "active_config"), Charset.defaultCharset());
+          Files.asCharSource(new File(configDir, "active_config"), Charset.defaultCharset())
+              .readFirstLine();
     } catch (IOException ex) {
       // ignore
     }

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,8 @@ private void waitForPort(int port) throws InterruptedException, TimeoutException`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`private ManagedChannel createChannel(int port) {`
`175`		`- // NOTE: usePlaintext is currently @ExperimentalAPI. In grpc 1.11 it be became parameterless.`
`176`		`- // In 1.12 it should be stable. See https://github.com/grpc/grpc-java/issues/1772 for discussion`
`177`	`175`	`return ManagedChannelBuilder.forAddress("localhost", port)`
`178`		`- .usePlaintext(true)`
	`176`	`+ .usePlaintext()`
`179`	`177`	`.maxInboundMessageSize(256 * 1024 * 1024)`
`180`	`178`	`.build();`
`181`	`179`	`}`