From 45ef6cc951e97d68cafd8f53a47b40b0b9ac5d78 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Wed, 9 Sep 2020 12:17:18 -0700
Subject: [PATCH] feat: Add postfix increment to ServiceStubSettings batch desc

---
 .../generator/gapic/composer/BatchingDescriptorComposer.java   | 3 ++-
 .../gapic/composer/BatchingDescriptorComposerTest.java         | 2 +-
 .../gapic/composer/ServiceStubSettingsClassComposerTest.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java b/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java
index f5b601a947..259e8951bd 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java
@@ -34,6 +34,7 @@
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.TypeNode;
+import com.google.api.generator.engine.ast.UnaryOperationExpr;
 import com.google.api.generator.engine.ast.ValueExpr;
 import com.google.api.generator.engine.ast.Variable;
 import com.google.api.generator.engine.ast.VariableExpr;
@@ -333,7 +334,7 @@ private static MethodDefinition createSplitResponseMethod(
           MethodInvocationExpr.builder()
               .setExprReferenceExpr(batchResponseVarExpr)
               .setMethodName(getSubresponseFieldMethodName)
-              .setArguments(batchMessageIndexVarExpr)
+              .setArguments(UnaryOperationExpr.postfixIncrementWithExpr(batchMessageIndexVarExpr))
               .build();
       innerSubresponseForExprs.add(
           MethodInvocationExpr.builder()
diff --git a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
index 0780e85fe8..179bdcec4f 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
@@ -140,7 +140,7 @@ public void batchingDescriptor_hasSubresponseField() {
             "List<String> subresponseElements = new ArrayList<>();\n",
             "long subresponseCount = responder.getMessageCount();\n",
             "for (int i = 0; i < subresponseCount; i++) {\n",
-            "subresponseElements.add(batchResponse.getMessageIds(batchMessageIndex));\n",
+            "subresponseElements.add(batchResponse.getMessageIds(batchMessageIndex++));\n",
             "}\n",
             "PublishResponse response ="
                 + " PublishResponse.newBuilder().addAllMessageIds(subresponseElements).build();\n",
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
index 2003af7eb2..5c076b6277 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
@@ -1820,7 +1820,7 @@ private static List<Service> parseServices(
           + "            long subresponseCount = responder.getMessageCount();\n"
           + "            for (int i = 0; i < subresponseCount; i++) {\n"
           + "             "
-          + " subresponseElements.add(batchResponse.getMessageIds(batchMessageIndex));\n"
+          + " subresponseElements.add(batchResponse.getMessageIds(batchMessageIndex++));\n"
           + "            }\n"
           + "            PublishResponse response =\n"
           + "               "