form param names must be included in getParameterNames() (#340)

Author: deki

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java

@@ -45,6 +45,9 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -360,11 +363,12 @@ public String getParameter(String s) {
 
     @Override
     public Enumeration<String> getParameterNames() {
+        Set<String> formParameterNames = getFormUrlEncodedParametersMap().keySet();
         if (request.getMultiValueQueryStringParameters() == null) {
-            return Collections.emptyEnumeration();
+            return Collections.enumeration(formParameterNames);
         }
-
-        return Collections.enumeration(request.getMultiValueQueryStringParameters().keySet());
+        return Collections.enumeration(Stream.concat(formParameterNames.stream(),
+                request.getMultiValueQueryStringParameters().keySet().stream()).collect(Collectors.toSet()));
     }
 
 

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestFormTest.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Random;
 
@@ -123,6 +124,7 @@ public void postForm_getParamsBase64Encoded_expectAllParams() {
         assertNotNull(params);
         assertEquals(2, params.size());
         assertTrue(params.containsKey(PART_KEY_1));
+        assertEquals(2, Collections.list(request.getParameterNames()).size());
     }
 
     /**
@@ -140,5 +142,6 @@ public void postForm_emptyParamPresent() {
         assertNotNull(params);
         assertEquals(2, params.size());
         assertTrue(params.containsKey(PART_KEY_1));
+        assertEquals(2, Collections.list(request.getParameterNames()).size());
     }
 }