⬆️ Upgrade WireMock to latest version

Also, start using WireMock/Spring Boot integration.  This will allow for
random ports to be used in that test.

Fixed an issue that surfaced during testing. New version of
WireMock/Spring Integration uses new version of Apache HTTP client that
does not like duplicate headers.  The POST proxy code was generating
duplicate Transfer-Encoding headers, so had to implement code to remove
the duplicate.

Author: rmcdouga

spring/fluentforms-spring-boot-autoconfigure/pom.xml

@@ -19,7 +19,8 @@
 		<jasypt.maven.plugin.version>3.0.5</jasypt.maven.plugin.version>
 		<fluentforms.version>0.0.5-SNAPSHOT</fluentforms.version>
 		<fp.hamcrest.matchers.version>0.0.4-SNAPSHOT</fp.hamcrest.matchers.version>
-		<wiremock.version>4.0.0-beta.16</wiremock.version>
+		<wiremock.version>4.0.0-beta.21</wiremock.version>
+		<wiremock-spring-boot.version>4.0.8</wiremock-spring-boot.version>
 		<pitest.maven.plugin.version>1.20.2</pitest.maven.plugin.version>
 		<pitest.junit5.maven.plugin.version>1.2.3</pitest.junit5.maven.plugin.version>
 	</properties>
@@ -86,6 +87,7 @@
 			<artifactId>rest-services.client</artifactId>
 			<version>${fluentforms.version}</version>
 		</dependency>
+
 		<!-- Testing Dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -104,6 +106,26 @@
 			<version>${wiremock.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.wiremock.integrations</groupId>
+			<artifactId>wiremock-spring-boot</artifactId>
+			<version>${wiremock-spring-boot.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Explicit HttpComponents (override transitive versions that may not support chunked correctly) -->
+<!--		<dependency>
+			<groupId>org.apache.hc.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+			<version>5.2.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hc.core5</groupId>
+			<artifactId>httpcore5</artifactId>
+			<version>5.2.3</version>
+			<scope>test</scope>
+		</dependency>
+-->
 		<dependency>
 			<groupId>org.pitest</groupId>
 			<artifactId>pitest-junit5-plugin</artifactId>

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyEndpoint.java

@@ -190,6 +190,16 @@ private static InputStream fixTogglesDotJsonLocation(InputStream is) {
 		return new ReplacingInputStream(is, target, replacement);
 	}
 
+    /**
+     * This function acts as a reverse proxy for anything POSTed to the server.  It just forwards
+     * anything it receives on AEM and then returns the response.  It logs slightly differently 
+     * if the request is a form submission.
+     * 
+     * @param remainder
+     * @param contentType
+     * @param in
+     * @return
+     */
     @PostMapping("/{*remainder}")
     public ResponseEntity<byte[]> proxyPost(@PathVariable("remainder") String remainder, @RequestHeader(value = "Content-Type", required = false) String contentType, byte[] in) {
     	logger.atDebug().log("Proxying POST request. remainder={}", remainder);
@@ -223,8 +233,10 @@ public ResponseEntity<byte[]> proxyPost(@PathVariable("remainder") String remain
 				  .log("Returning POST response from target '{}'.");
 		}
 
-		return response;
-    }
+		return ResponseEntity.status(response.getStatusCode())
+				.headers(removeChunkedTransferEncoding(response.getHeaders()))
+				.body(response.getBody());
+}
 
     private static byte[] debugInput(byte[] inputBytes, String target) {
 		logger.atDebug()

spring/fluentforms-spring-boot-autoconfigure/src/test/java/com/_4point/aem/fluentforms/spring/AemProxyEndpointTest.java

@@ -23,16 +23,17 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.web.client.RestClient;
+import org.wiremock.spring.ConfigureWireMock;
+import org.wiremock.spring.EnableWireMock;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 
-@WireMockTest(httpPort = AemProxyEndpointTest.WIREMOCK_PORT)
+@WireMockTest()
 @SpringBootTest(classes = {com._4point.aem.fluentforms.spring.AemProxyEndpointTest.TestApplication.class}, 
 webEnvironment = WebEnvironment.RANDOM_PORT,
 properties = {
 "fluentforms.aem.servername=localhost", 
-"fluentforms.aem.port=" + AemProxyEndpointTest.WIREMOCK_PORT, 
 "fluentforms.aem.user=ENC(7FgD3ZsSExfUGRYlXNc++6C1upPBURNKq6HouzagnNZW4FsBwFs5+crawv+djhw6)",		 
 "fluentforms.aem.password=ENC(QmQ6iTm/+TOO8U3dDuBzJWH129vReWgYNdgqQwWhjWaQy6j8sMnk2/Auhehmlh3v)",
 //"fluentforms.aem.useSsl=true",
@@ -43,6 +44,10 @@
 "jasypt.encryptor.salt-generator-classname=org.jasypt.salt.RandomSaltGenerator",
 "logging.level.com._4point.aem.fluentforms.spring.AemProxyEndpoint=DEBUG"
 })
+@EnableWireMock(@ConfigureWireMock(
+		portProperties = "fluentforms.aem.port"
+		)
+	)
 @Timeout(value = 5, unit = TimeUnit.MINUTES)	// Fail tests that take longer than this to prevent hanging.
 class AemProxyEndpointTest {
 	private final static Logger logger = LoggerFactory.getLogger(AemProxyEndpointTest.class);