---

pongad · garrettjonesgoogle · commit 8edb7c2db1d6 · 2017-03-31T10:17:13.000-07:00
yaml --- r: 7935 b: refs/heads/tswast-patch-1 c: e4acca8 h: refs/heads/master i: 7933: 5159869 7931: b88edb8 7927: 7040d0a 7919: c9e5ae6 7903: b530232 7871: 1431a6e 7807: b3805de 7679: 91f58f2
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: d726f41c099c8213ea66eeec6f892887de65ebb4
+refs/heads/tswast-patch-1: e4acca8bd5a96b567d573d04957eb54b703bddc9
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
@@ -21,6 +21,7 @@
 
 import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.PartitionKey;
 import com.google.api.gax.batching.RequestBuilder;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
@@ -399,13 +400,9 @@ public ListLogsPagedResponse createPagedListResponse(
       WRITE_LOG_ENTRIES_BATCHING_DESC =
           new BatchingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>() {
             @Override
-            public String getBatchPartitionKey(WriteLogEntriesRequest request) {
-              return request.getLogName()
-                  + "|"
-                  + request.getResource()
-                  + "|"
-                  + request.getLabels()
-                  + "|";
+            public PartitionKey getBatchPartitionKey(WriteLogEntriesRequest request) {
+              return new PartitionKey(
+                  request.getLogName(), request.getResource(), request.getLabels());
             }
 
             @Override
diff --git a/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java b/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse;
 
 import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.PartitionKey;
 import com.google.api.gax.batching.RequestBuilder;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
@@ -371,8 +372,8 @@ public ListTopicSubscriptionsPagedResponse createPagedListResponse(
   private static final BatchingDescriptor<PublishRequest, PublishResponse> PUBLISH_BATCHING_DESC =
       new BatchingDescriptor<PublishRequest, PublishResponse>() {
         @Override
-        public String getBatchPartitionKey(PublishRequest request) {
-          return request.getTopic() + "|";
+        public PartitionKey getBatchPartitionKey(PublishRequest request) {
+          return new PartitionKey(request.getTopic());
         }
 
         @Override
diff --git a/branches/tswast-patch-1/pom.xml b/branches/tswast-patch-1/pom.xml
@@ -92,7 +92,7 @@
     <github.global.server>github</github.global.server>
     <google.auth.version>0.6.0</google.auth.version>
     <grpc.version>1.0.3</grpc.version>
-    <gax.version>0.7.0</gax.version>
+    <gax.version>0.8.0</gax.version>
     <generatedProto.version>0.1.5</generatedProto.version>
     <core.version>0.10.1-alpha-SNAPSHOT</core.version>
     <beta.version>0.10.1-beta-SNAPSHOT</beta.version>
