✨ Added support for cookies to AdaptiveFormsService

When rendering an Adaptive Form with data, the client makes two calls to
AEM.  In order for load-balancing to work, cookies provided in the
response to the first call need to be transferred to and sent back in
the second call.

The code now does this.

Author: rmcdouga

rest-services/client/src/main/java/com/_4point/aem/docservices/rest_services/client/af/AdaptiveFormsService.java

@@ -11,6 +11,7 @@
 
 import com._4point.aem.docservices.rest_services.client.RestClient;
 import com._4point.aem.docservices.rest_services.client.RestClient.ContentType;
+import com._4point.aem.docservices.rest_services.client.RestClient.Cookies;
 import com._4point.aem.docservices.rest_services.client.RestClient.GetRequest;
 import com._4point.aem.docservices.rest_services.client.RestClient.MultipartPayload;
 import com._4point.aem.docservices.rest_services.client.RestClient.Response;
@@ -106,7 +107,9 @@ public Document renderAdaptiveForm(PathOrUrl template, Document data) throws Ada
 		builder = builder.queryParam("wcmmode", "disabled");
 
 		if (!data.isEmpty()) {
-			builder = builder.queryParam(DATA_REF_PARAM, generateDataRefParam(postDataToDataCacheService(data)));
+			DataCacheResponse response = postDataToDataCacheService(data);
+			builder = builder.queryParam(DATA_REF_PARAM, generateDataRefParam(response.uuid()))
+							 .addCookies(response.cookies());
 		}
 
 		GetRequest getRequest = builder.build();
@@ -128,12 +131,14 @@ private String generateDataRefParam(String uuid) {
 		return "service://FFPrefillService/" + uuid;
 	}
 
-	private String postDataToDataCacheService(Document data) throws AdaptiveFormsServiceException {
+	private record DataCacheResponse(String uuid, Cookies cookies) {}
+	
+	private DataCacheResponse postDataToDataCacheService(Document data) throws AdaptiveFormsServiceException {
         try (MultipartPayload payload = dataCacheRestClient.multipartPayloadBuilder()
         												   .add(DATA_SERVICE_DATA_PARAM, data, getContentType(data))
         												   .build()) {
 			return payload.postToServer(ContentType.TEXT_PLAIN)
-						  .map(uncheck(AdaptiveFormsService::responseToString))
+						  .map(uncheck(AdaptiveFormsService::mapResponse))
 						  .orElseThrow();
 
         } catch (IOException e) {
@@ -152,8 +157,8 @@ private static ContentType getContentType(Document data) {
 		}
 	}
 
-	private static String responseToString(Response result) throws IOException {
-		return new String(result.data().readAllBytes());
+	private static DataCacheResponse mapResponse(Response result) throws IOException {
+		return new DataCacheResponse(new String(result.data().readAllBytes()), result.getCookies());
 	}
 
 	/**

rest-services/client/src/test/java/com/_4point/aem/docservices/rest_services/client/af/AdaptiveFormsServiceTest.java

@@ -28,6 +28,7 @@
 
 import com._4point.aem.docservices.rest_services.client.RestClient;
 import com._4point.aem.docservices.rest_services.client.RestClient.ContentType;
+import com._4point.aem.docservices.rest_services.client.RestClient.Cookies;
 import com._4point.aem.docservices.rest_services.client.RestClient.GetRequest;
 import com._4point.aem.docservices.rest_services.client.RestClient.MultipartPayload;
 import com._4point.aem.docservices.rest_services.client.RestClient.Response;
@@ -62,6 +63,7 @@ class AdaptiveFormsServiceTest {
 	@Mock(stubOnly = true) GetRequest.Builder mockGetRequestBuilder;
 	@Mock(stubOnly = true) Response mockPostResponse;
 	@Mock(stubOnly = true) Response mockGetResponse;
+	@Mock(stubOnly = true) Cookies mockCookies;
 
 	@Captor ArgumentCaptor<AemConfig> aemConfig;
 	@Captor ArgumentCaptor<String> servicePath;
@@ -172,6 +174,7 @@ void testRenderAdaptiveForm(HappyPath scenario) throws Exception {
 			setupDataServiceMocks(setupMockPostResponse(DUMMY_GUID.getBytes(), ContentType.TEXT_PLAIN));
 			when(mockPayloadBuilder.add(eq("Data"), Mockito.any(Document.class), eq(scenario.contentType))).thenReturn(mockPayloadBuilder);
 			when(mockGetRequestBuilder.queryParam(eq("dataRef"), eq("service://FFPrefillService/" + DUMMY_GUID))).thenReturn(mockGetRequestBuilder);
+			when(mockGetRequestBuilder.addCookies(Mockito.any(Cookies.class))).thenReturn(mockGetRequestBuilder);
 		}
 
 		AdaptiveFormsService underTest = createAdapter(mockClientFactory);
@@ -210,6 +213,7 @@ private void setupFilterMocks(byte[] responseData) throws RestClientException {
 		setupDataServiceMocks(setupMockPostResponse(DUMMY_GUID.getBytes(), ContentType.TEXT_PLAIN));
 		when(mockPayloadBuilder.add(eq("Data"), Mockito.any(Document.class), Mockito.any(ContentType.class))).thenReturn(mockPayloadBuilder);
 		when(mockGetRequestBuilder.queryParam(eq("dataRef"), eq("service://FFPrefillService/" + DUMMY_GUID))).thenReturn(mockGetRequestBuilder);
+		when(mockGetRequestBuilder.addCookies(Mockito.any(Cookies.class))).thenReturn(mockGetRequestBuilder);
 	}
 
 	@Test
@@ -258,6 +262,7 @@ private void setupAfServiceMocks(String form, Optional<Response> mockedResponse)
 	private Optional<Response> setupMockPostResponse(byte[] responseData, ContentType expectedContentType) {
 //		when(mockPostResponse.contentType()).thenReturn(expectedContentType);	// ContentType is not queries.
 		when(mockPostResponse.data()).thenReturn(new ByteArrayInputStream(responseData));
+		when(mockPostResponse.getCookies()).thenReturn(mockCookies);
 		return Optional.of(mockPostResponse);
 	}