Rolling back 'java: optimize partition key (#1125)' (#1131)

garrettjonesgoogle · web-flow · commit 5232fab33d24 · 2017-03-22T11:11:56.000-07:00
diff --git a/src/main/java/com/google/api/codegen/transformer/BatchingTransformer.java b/src/main/java/com/google/api/codegen/transformer/BatchingTransformer.java
@@ -139,6 +139,7 @@ private List<BatchingPartitionKeyView> generatePartitionKeys(MethodTransformerCo
       Name selectedTypeName = Name.from(fieldSelector.getLastField().getSimpleName());
       BatchingPartitionKeyView key =
           BatchingPartitionKeyView.newBuilder()
+              .separatorLiteral("\"|\"")
               .fieldGetFunction(
                   context.getNamer().getFieldGetFunctionName(selectedType, selectedTypeName))
               .build();
diff --git a/src/main/java/com/google/api/codegen/transformer/java/JavaGapicSurfaceTransformer.java b/src/main/java/com/google/api/codegen/transformer/java/JavaGapicSurfaceTransformer.java
@@ -459,7 +459,6 @@ private void addSettingsImports(SurfaceTransformerContext context) {
     }
     if (interfaceConfig.hasBatchingMethods()) {
       typeTable.saveNicknameFor("com.google.api.gax.batching.BatchingSettings");
-      typeTable.saveNicknameFor("com.google.api.gax.batching.PartitionKey");
       typeTable.saveNicknameFor("com.google.api.gax.batching.RequestBuilder");
       typeTable.saveNicknameFor("com.google.api.gax.core.FlowController");
       typeTable.saveNicknameFor("com.google.api.gax.core.FlowController.LimitExceededBehavior");
diff --git a/src/main/java/com/google/api/codegen/viewmodel/BatchingPartitionKeyView.java b/src/main/java/com/google/api/codegen/viewmodel/BatchingPartitionKeyView.java
@@ -19,6 +19,8 @@
 @AutoValue
 public abstract class BatchingPartitionKeyView {
 
+  public abstract String separatorLiteral();
+
   public abstract String fieldGetFunction();
 
   public static Builder newBuilder() {
@@ -28,6 +30,8 @@ public static Builder newBuilder() {
   @AutoValue.Builder
   public abstract static class Builder {
 
+    public abstract Builder separatorLiteral(String val);
+
     public abstract Builder fieldGetFunction(String val);
 
     public abstract BatchingPartitionKeyView build();
diff --git a/src/main/resources/com/google/api/codegen/java/settings.snip b/src/main/resources/com/google/api/codegen/java/settings.snip
@@ -318,8 +318,8 @@
     private static final BatchingDescriptor<{@desc.requestTypeName}, {@desc.responseTypeName}> {@desc.name} =
         new BatchingDescriptor<{@desc.requestTypeName}, {@desc.responseTypeName}>() {
           @@Override
-          public PartitionKey getBatchPartitionKey({@desc.requestTypeName} request) {
-            return new PartitionKey({@partitionKeyCode(desc)});
+          public String getBatchPartitionKey({@desc.requestTypeName} request) {
+            return {@partitionKeyCode(desc)};
           }
 
           @@Override
@@ -388,8 +388,8 @@
 @end
 
 @private partitionKeyCode(batchingDesc)
-  @join partitionKey : batchingDesc.partitionKeys on ", "
-    request.{@partitionKey.fieldGetFunction}()
+  @join partitionKey : batchingDesc.partitionKeys on " + "
+    request.{@partitionKey.fieldGetFunction}() + {@partitionKey.separatorLiteral}
   @end
 @end
 
diff --git a/src/test/java/com/google/api/codegen/testdata/java_settings_library.baseline b/src/test/java/com/google/api/codegen/testdata/java_settings_library.baseline
@@ -17,7 +17,6 @@
 package com.google.gcloud.pubsub.spi;
 
 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.CredentialsProvider;
 import com.google.api.gax.core.FlowControlSettings;
@@ -662,8 +661,8 @@ public class LibrarySettings extends ClientSettings {
   private static final BatchingDescriptor<PublishSeriesRequest, PublishSeriesResponse> PUBLISH_SERIES_BATCHING_DESC =
       new BatchingDescriptor<PublishSeriesRequest, PublishSeriesResponse>() {
         @Override
-        public PartitionKey getBatchPartitionKey(PublishSeriesRequest request) {
-          return new PartitionKey(request.getEdition(), request.getName());
+        public String getBatchPartitionKey(PublishSeriesRequest request) {
+          return request.getEdition() + "|" + request.getName() + "|";
         }
 
         @Override
@@ -726,8 +725,8 @@ public class LibrarySettings extends ClientSettings {
   private static final BatchingDescriptor<AddCommentsRequest, Empty> ADD_COMMENTS_BATCHING_DESC =
       new BatchingDescriptor<AddCommentsRequest, Empty>() {
         @Override
-        public PartitionKey getBatchPartitionKey(AddCommentsRequest request) {
-          return new PartitionKey(request.getName());
+        public String getBatchPartitionKey(AddCommentsRequest request) {
+          return request.getName() + "|";
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,6 @@ private void addSettingsImports(SurfaceTransformerContext context) {`
`459`	`459`	`}`
`460`	`460`	`if (interfaceConfig.hasBatchingMethods()) {`
`461`	`461`	`typeTable.saveNicknameFor("com.google.api.gax.batching.BatchingSettings");`
`462`		`- typeTable.saveNicknameFor("com.google.api.gax.batching.PartitionKey");`
`463`	`462`	`typeTable.saveNicknameFor("com.google.api.gax.batching.RequestBuilder");`
`464`	`463`	`typeTable.saveNicknameFor("com.google.api.gax.core.FlowController");`
`465`	`464`	`typeTable.saveNicknameFor("com.google.api.gax.core.FlowController.LimitExceededBehavior");`