Merge pull request #7 from ottobackwards/params_null_body

Handle null response body and support Parameters

Author: rpgreen

.gitignore

@@ -1,5 +1,13 @@
+target
 *.class
 
+# IDE files
+# Intellij
+.idea/
+*.iml
+*.iws
+*~
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 

src/main/java/ca/ryangreen/apigateway/generic/GenericApiGatewayClient.java

@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class GenericApiGatewayClient extends AmazonWebServiceClient {
@@ -64,10 +65,10 @@ public AmazonServiceException unmarshall(JsonNode jsonContent) throws Exception
     }
 
     public GenericApiGatewayResponse execute(GenericApiGatewayRequest request) {
-        return execute(request.getHttpMethod(), request.getResourcePath(), request.getHeaders(), request.getBody());
+        return execute(request.getHttpMethod(), request.getResourcePath(), request.getHeaders(), request.getParameters(), request.getBody());
     }
 
-    private GenericApiGatewayResponse execute(HttpMethodName method, String resourcePath, Map<String, String> headers, InputStream content) {
+    private GenericApiGatewayResponse execute(HttpMethodName method, String resourcePath, Map<String, String> headers, Map<String,List<String>> parameters, InputStream content) {
         final ExecutionContext executionContext = buildExecutionContext();
 
         DefaultRequest request = new DefaultRequest(API_GATEWAY_SERVICE_NAME);
@@ -76,7 +77,9 @@ private GenericApiGatewayResponse execute(HttpMethodName method, String resource
         request.setEndpoint(this.endpoint);
         request.setResourcePath(resourcePath);
         request.setHeaders(buildRequestHeaders(headers, apiKey));
-
+        if (parameters != null) {
+            request.setParameters(parameters);
+        }
         return this.client.execute(request, responseHandler, errorResponseHandler, executionContext).getAwsResponse();
     }
 

src/main/java/ca/ryangreen/apigateway/generic/GenericApiGatewayRequest.java

@@ -4,20 +4,25 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 public class GenericApiGatewayRequest {
+
     private final HttpMethodName httpMethod;
     private final String resourcePath;
     private final InputStream body;
     private final Map<String, String> headers;
+    private final Map<String, List<String>> parameters;
 
     public GenericApiGatewayRequest(HttpMethodName httpMethod, String resourcePath,
-                                    InputStream body, Map<String, String> headers) {
+                                    InputStream body, Map<String, String> headers,
+                                    Map<String, List<String>> parameters) {
         this.httpMethod = httpMethod;
         this.resourcePath = resourcePath;
         this.body = body;
         this.headers = headers;
+        this.parameters = parameters;
     }
 
     public HttpMethodName getHttpMethod() {
@@ -35,4 +40,8 @@ public InputStream getBody() {
     public Map<String, String> getHeaders() {
         return headers;
     }
+
+    public Map<String, List<String>> getParameters() {
+        return parameters;
+    }
 }

src/main/java/ca/ryangreen/apigateway/generic/GenericApiGatewayRequestBuilder.java

@@ -4,13 +4,15 @@
 import ca.ryangreen.apigateway.util.Validate;
 
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 public class GenericApiGatewayRequestBuilder {
     private HttpMethodName httpMethod;
     private String resourcePath;
     private InputStream body;
     private Map<String, String> headers;
+    private Map<String, List<String>> parameters;
 
     public GenericApiGatewayRequestBuilder withHttpMethod(HttpMethodName name) {
         httpMethod = name;
@@ -32,9 +34,14 @@ public GenericApiGatewayRequestBuilder withHeaders(Map<String, String> headers)
         return this;
     }
 
+    public GenericApiGatewayRequestBuilder withParameters(Map<String,List<String>> parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
     public GenericApiGatewayRequest build() {
         Validate.notNull(httpMethod, "HTTP method");
         Validate.notEmpty(resourcePath, "Resource path");
-        return new GenericApiGatewayRequest(httpMethod, resourcePath, body, headers);
+        return new GenericApiGatewayRequest(httpMethod, resourcePath, body, headers, parameters);
     }
 }

src/main/java/ca/ryangreen/apigateway/generic/GenericApiGatewayResponse.java

@@ -11,7 +11,11 @@ public class GenericApiGatewayResponse {
 
     public GenericApiGatewayResponse(HttpResponse httpResponse) throws IOException {
         this.httpResponse = httpResponse;
-        this.body = IOUtils.toString(httpResponse.getContent());
+        if (httpResponse.getContent()!= null) {
+            this.body = IOUtils.toString(httpResponse.getContent());
+        } else {
+            this.body = null;
+        }
     }
 
     public HttpResponse getHttpResponse() {

src/test/java/ca/ryangreen/apigateway/generic/GenericApiGatewayClientTest.java

@@ -9,6 +9,8 @@
 import com.amazonaws.http.apache.client.impl.SdkHttpClient;
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -81,6 +83,33 @@ public void testExecute_happy() throws IOException {
                 any(HttpContext.class));
     }
 
+    @Test
+    public void testExecute_happy_parameters() throws IOException {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Account-Id", "fubar");
+        headers.put("Content-Type", "application/json");
+        Map<String,List<String>> parameters = new HashMap<>();
+        parameters.put("MyParam", Arrays.asList("MyParamValue"));
+        GenericApiGatewayResponse response = client.execute(
+            new GenericApiGatewayRequestBuilder()
+                .withBody(new ByteArrayInputStream("test request".getBytes()))
+                .withHttpMethod(HttpMethodName.POST)
+                .withHeaders(headers)
+                .withParameters(parameters)
+                .withResourcePath("/test/orders").build());
+
+        assertEquals("Wrong response body", "test payload", response.getBody());
+        assertEquals("Wrong response status", 200, response.getHttpResponse().getStatusCode());
+
+        Mockito.verify(mockClient, times(1)).execute(argThat(new LambdaMatcher<>(
+                                                         x -> (x.getMethod().equals("POST")
+                                                             && x.getFirstHeader("Account-Id").getValue().equals("fubar")
+                                                             && x.getFirstHeader("x-api-key").getValue().equals("12345")
+                                                             && x.getFirstHeader("Authorization").getValue().startsWith("AWS4")
+                                                             && x.getURI().toString().equals("https://foobar.execute-api.us-east-1.amazonaws.com/test/orders?MyParam=MyParamValue")))),
+                                                     any(HttpContext.class));
+    }
+
     @Test
     public void testExecute_noApiKey_noCreds() throws IOException {
         client = new GenericApiGatewayClientBuilder()