test: move to Apache HTTP Client 5 for testing

deki · deki · commit 04d8509172eb · 2023-05-19T13:37:54.000+02:00
diff --git a/aws-serverless-java-container-core/pom.xml b/aws-serverless-java-container-core/pom.xml
@@ -72,25 +72,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.14</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>5.2.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.core5</groupId>
-            <artifactId>httpcore5</artifactId>
-            <version>5.2.1</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
diff --git a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandlerTest.java b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandlerTest.java
@@ -10,7 +10,7 @@
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 import com.amazonaws.services.lambda.runtime.Context;
-import org.apache.http.impl.execchain.RequestAbortedException;
+import org.apache.hc.client5.http.impl.classic.RequestAbortedException;
 import org.junit.jupiter.api.Test;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestFormTest.java b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestFormTest.java
@@ -5,9 +5,9 @@
 import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;;
 import org.junit.jupiter.api.Test;
 
 import jakarta.servlet.ServletException;
@@ -71,7 +71,7 @@ void postForm_getParam_getEncodedFullValue() {
     void postForm_getParts_parsing() {
         try {
             AwsProxyRequest proxyRequest = new AwsProxyRequestBuilder("/form", "POST")
-                    .header(MULTIPART_FORM_DATA.getContentType().getName(), MULTIPART_FORM_DATA.getContentType().getValue())
+                    .header(HttpHeaders.CONTENT_TYPE, MULTIPART_FORM_DATA.getContentType())
                     //.header(formData.getContentEncoding().getName(), formData.getContentEncoding().getValue())
                     .body(IOUtils.toString(MULTIPART_FORM_DATA.getContent(), Charset.defaultCharset()))
                     .build();
@@ -90,7 +90,7 @@ void postForm_getParts_parsing() {
     void multipart_getParts_binary() {
         try {
             AwsProxyRequest proxyRequest = new AwsProxyRequestBuilder("/form", "POST")
-                    .header(MULTIPART_BINARY_DATA.getContentType().getName(), MULTIPART_BINARY_DATA.getContentType().getValue())
+                    .header(HttpHeaders.CONTENT_TYPE, MULTIPART_BINARY_DATA.getContentType())
                     .header(HttpHeaders.CONTENT_LENGTH, MULTIPART_BINARY_DATA.getContentLength() + "")
                     .binaryBody(MULTIPART_BINARY_DATA.getContent())
                     .build();
diff --git a/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java b/aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java
@@ -18,10 +18,11 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.ByteArrayBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.entity.mime.ByteArrayBody;
+import org.apache.hc.client5.http.entity.mime.StringBody;
 
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
@@ -162,15 +163,15 @@ public AwsProxyRequestBuilder formFilePart(String fieldName, String fileName, by
         return this;
     }
 
-    public AwsProxyRequestBuilder formFieldPart(String fieldName, String fieldValue)
+    public AwsProxyRequestBuilder formTextFieldPart(String fieldName, String fieldValue)
             throws IOException {
         if (request.getMultiValueHeaders() == null) {
             request.setMultiValueHeaders(new Headers());
         }
         if (multipartBuilder == null) {
             multipartBuilder = MultipartEntityBuilder.create();
         }
-        multipartBuilder.addPart(fieldName, new StringBody(fieldValue));
+        multipartBuilder.addPart(fieldName, new StringBody(fieldValue, ContentType.TEXT_PLAIN));
         buildMultipartBody();
         return this;
     }
@@ -188,7 +189,7 @@ private void buildMultipartBody()
         request.setBody(Base64.getMimeEncoder().encodeToString(finalBuffer));
         request.setIsBase64Encoded(true);
         this.request.setMultiValueHeaders(new Headers());
-        header(HttpHeaders.CONTENT_TYPE, bodyEntity.getContentType().getValue());
+        header(HttpHeaders.CONTENT_TYPE, bodyEntity.getContentType());
         header(HttpHeaders.CONTENT_LENGTH, bodyEntity.getContentLength() + "");
     }
 
diff --git a/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle
@@ -22,6 +22,7 @@ dependencies {
   }
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
+  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
   testImplementation("junit:junit:4.13.2")
 }
 
diff --git a/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/pom.xml
@@ -33,6 +33,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
diff --git a/aws-serverless-spark-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spark-archetype/src/main/resources/archetype-resources/build.gradle
@@ -13,6 +13,7 @@ dependencies {
   )
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
+  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
   testImplementation("junit:junit:4.13.2")
 }
 
diff --git a/aws-serverless-spark-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-spark-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,6 +34,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.sparkjava</groupId>
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
@@ -18,6 +18,7 @@ dependencies {
   )
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
+  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
   testImplementation("junit:junit:4.13.2")
 }
 
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml
@@ -35,6 +35,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/build.gradle
@@ -12,6 +12,7 @@ dependencies {
   )
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
+  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
   testImplementation("junit:junit:4.13.2")
 }
 
diff --git a/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/pom.xml
@@ -37,6 +37,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
@@ -42,6 +42,7 @@ dependencies {
   implementation ('com.amazonaws:aws-lambda-java-log4j2:1.5.1')
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
+  testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
   testImplementation('junit:junit:4.13.2')
   testImplementation('org.apache.struts:struts2-junit-plugin:6.1.2') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
@@ -35,6 +35,12 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
diff --git a/pom.xml b/pom.xml
@@ -116,6 +116,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ dependencies {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")`
	`25`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")`
`25`	`26`	`testImplementation("junit:junit:4.13.2")`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ dependencies {`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")`
	`16`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")`
`16`	`17`	`testImplementation("junit:junit:4.13.2")`
`17`	`18`	`}`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ dependencies {`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")`
	`21`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")`
`21`	`22`	`testImplementation("junit:junit:4.13.2")`
`22`	`23`	`}`
`23`	`24`