Revert a bunch of merge collateral damage

src/main/resources/com/google/api/codegen/java/main.snip

@@ -357,7 +357,7 @@
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
   @join commentLine : apiMethodDoc.mainDocLines
-    {@""} * {@commentLine} 
+    {@""} * {@commentLine}
   @end
    *
    * Sample code:
@@ -368,7 +368,7 @@
    * </code></pre>
   @if apiMethodDoc.paramDocs
     {@""} *
-    @join doc : apiMethodDoc.paramDocs 
+    @join doc : apiMethodDoc.paramDocs
       {@paramDoc(doc)}
     @end
   @end
@@ -406,5 +406,13 @@
 @end
 
 @private pathTemplateCheckLine(pathTemplateCheck)
-  {@pathTemplateCheck.pathTemplateName}.validate({@pathTemplateCheck.paramName}, "{@pathTemplateCheck.validationMessageContext}");
+  @if pathTemplateCheck.allowEmptyString
+    if (!{@pathTemplateCheck.paramName}.isEmpty()) {
+      {@pathTemplateCheck.pathTemplateName}.validate({@pathTemplateCheck.paramName}, \
+        "{@pathTemplateCheck.validationMessageContext}");
+    }
+  @else
+    {@pathTemplateCheck.pathTemplateName}.validate({@pathTemplateCheck.paramName}, \
+      "{@pathTemplateCheck.validationMessageContext}");
+  @end
 @end

src/main/resources/com/google/api/codegen/java/mock_service.snip

@@ -22,6 +22,11 @@
       return serviceImpl.getRequests();
     }
 
+    @@Override
+    public void setResponses(List<GeneratedMessage> responses) {
+      serviceImpl.setResponses(responses);
+    }
+
     @@Override
     public ServerServiceDefinition getServiceDefinition() {
       return {@mockService.grpcContainerName}.bindService(serviceImpl);

src/main/resources/com/google/api/codegen/java/mock_service_impl.snip

@@ -11,42 +11,41 @@
 
   @@javax.annotation.Generated("by GAPIC")
   public class {@mockServiceImpl.name} implements {@mockServiceImpl.grpcClassName}  {
-     private ArrayList<GeneratedMessage> requests;
+    private ArrayList<GeneratedMessage> requests;
+    private Queue<GeneratedMessage> responses;
 
-     public {@mockServiceImpl.name}() {
-       requests = new ArrayList<>();
-     }
+    public {@mockServiceImpl.name}() {
+      requests = new ArrayList<>();
+      responses = new LinkedList<>();
+    }
 
-     public List<GeneratedMessage> getRequests() {
-       return requests;
-     }
+    public List<GeneratedMessage> getRequests() {
+      return requests;
+    }
 
-     public void reset() {
-       requests = new ArrayList<>();
-     }
+    public void setResponses(List<GeneratedMessage> responses) {
+      this.responses = Lists.newLinkedList(responses);
+    }
+
+    public void reset() {
+      requests = new ArrayList<>();
+      responses = new LinkedList<>();
+    }
 
-     @join method : mockServiceImpl.grpcMethods
-      {@grpcMethod(method)}
+    @join method : mockServiceImpl.grpcMethods
+     {@grpcMethod(method)}
 
-     @end
+    @end
   }
 @end
 
 @private grpcMethod(method)
   @@Override
-  @if method.isStreaming
-    public StreamObserver<{@method.requestTypeName}> {@method.name}(
-        StreamObserver<{@method.responseTypeName}> responseObserver) {
-      System.err.println("Streaming method is not supported.");
-      return null;
-    }
-  @else
-    public void {@method.name}({@method.requestTypeName} request,
-      StreamObserver<{@method.responseTypeName}> responseObserver) {
-      {@method.responseTypeName} response = ({@method.responseTypeName}) responses.remove();
-      requests.add(request);
-      responseObserver.onNext(response);
-      responseObserver.onCompleted();
-    }
-  @end
+  public void {@method.name}({@method.requestTypeName} request,
+    StreamObserver<{@method.responseTypeName}> responseObserver) {
+    {@method.responseTypeName} response = ({@method.responseTypeName}) responses.remove();
+    requests.add(request);
+    responseObserver.onNext(response);
+    responseObserver.onCompleted();
+  }
 @end

src/main/resources/com/google/api/codegen/java/test.snip

@@ -52,31 +52,48 @@
   @@Test
   @@SuppressWarnings("all")
   public void {@test.name}() {
+    {@setResponse(test.mockResponse)}
+
     {@initCode(test.initCode)}
     {@methodCall(test)}
 
-    List<GeneratedMessage> requests = serviceHelper.getService().getRequests();
-    Assert.assertEquals(1, requests.size());
-    {@test.requestTypeName} request = ({@test.requestTypeName})requests.get(0);
+    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    {@test.requestTypeName} actualRequest = ({@test.requestTypeName})actualRequests.get(0);
 
     @join assert : test.asserts
-      Assert.assertEquals(request.{@assert.actualValueGetter}(), {@assert.expectedValueIdentifier});
+      Assert.assertEquals(actualRequest.{@assert.actualValueGetter}(), {@assert.expectedValueIdentifier});
     @end
   }
 @end
 
+@private setResponse(response)
+  {@initCode(response.initCode)}
+  List<GeneratedMessage> expectedResponses = new ArrayList<>();
+  expectedResponses.add(expectedResponse);
+  serviceHelper.getService().setResponses(expectedResponses);
+@end
+
 @private methodCall(test)
   @switch test.methodType
   @case "PagedFlattenedMethod"
-    PageAccessor<{@test.resourceTypeName}> response = api.{@test.surfaceMethodName}(\
+    PageAccessor<{@test.resourceTypeName}> pageAccessor = api.{@test.surfaceMethodName}(\
       {@sampleMethodCallArgList(test.initCode.fieldSettings)});
 
     // PageAccessor will not make actual request until it is being used.
     // Add all the pages here in order to make grpc requests.
-    List<{@test.resourceTypeName}> resources = Lists.newArrayList(response.getPageValues());
+    List<{@test.resourceTypeName}> resources = Lists.newArrayList(pageAccessor.getPageValues());
+    Assert.assertEquals(0, resources.size());
   @case "FlattenedMethod"
-    api.{@test.surfaceMethodName}(\
-      {@sampleMethodCallArgList(test.initCode.fieldSettings)});
+    @if test.hasReturnValue
+      {@test.responseTypeName} actualResponse =
+          api.{@test.surfaceMethodName}(\
+          {@sampleMethodCallArgList(test.initCode.fieldSettings)});
+      Assert.assertEquals(expectedResponse, actualResponse);
+    @else
+      api.{@test.surfaceMethodName}(\
+            {@sampleMethodCallArgList(test.initCode.fieldSettings)});
+    @end
   @default
     $unhandledCase: {@test.type}$
   @end