moved getParts and getPart to AwsHttpServletRequest

Author: mbfreder

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

@@ -235,25 +235,6 @@ public void logout() throws ServletException {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Collection<Part> getParts() throws IOException, ServletException {
-        List<Part> partList =
-                getMultipartFormParametersMap().values().stream()
-                        .flatMap(List::stream)
-                        .collect(Collectors.toList());
-        return partList;
-    }
-
-    @Override
-    public Part getPart(String s) throws IOException, ServletException {
-        // In case there's multiple files with the same fieldName, we return the first one in the list
-        List<Part> values = getMultipartFormParametersMap().get(s);
-        if (Objects.isNull(values)) {
-            return null;
-        }
-        return getMultipartFormParametersMap().get(s).get(0);
-    }
-
     @Override
     public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
         throw new UnsupportedOperationException();

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

@@ -510,6 +510,27 @@ protected Map<String, List<String>> getFormUrlEncodedParametersMap() {
         return urlEncodedFormParameters;
     }
 
+    @Override
+    public Collection<Part> getParts()
+            throws IOException, ServletException {
+        List<Part> partList =
+                getMultipartFormParametersMap().values().stream()
+                        .flatMap(List::stream)
+                        .collect(Collectors.toList());
+        return partList;
+    }
+
+    @Override
+    public Part getPart(String s)
+            throws IOException, ServletException {
+        // In case there's multiple files with the same fieldName, we return the first one in the list
+        List<Part> values = getMultipartFormParametersMap().get(s);
+        if (Objects.isNull(values)) {
+            return null;
+        }
+        return getMultipartFormParametersMap().get(s).get(0);
+    }
+
     @SuppressFBWarnings({"FILE_UPLOAD_FILENAME", "WEAK_FILENAMEUTILS"})
     protected Map<String, List<Part>> getMultipartFormParametersMap() {
         if (multipartFormParameters != null) {

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

@@ -255,30 +255,6 @@ public void logout()
         throw new UnsupportedOperationException();
     }
 
-
-    @Override
-    public Collection<Part> getParts()
-            throws IOException, ServletException {
-        List<Part> partList =
-                getMultipartFormParametersMap().values().stream()
-                        .flatMap(List::stream)
-                        .collect(Collectors.toList());
-        return partList;
-    }
-
-
-    @Override
-    public Part getPart(String s)
-            throws IOException, ServletException {
-        // In case there's multiple files with the same fieldName, we return the first one in the list
-        List<Part> values = getMultipartFormParametersMap().get(s);
-        if (Objects.isNull(values)) {
-            return null;
-        }
-        return getMultipartFormParametersMap().get(s).get(0);
-    }
-
-
     @Override
     public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass)
             throws IOException, ServletException {