✨ Updated GeneratePdf Rest Service Adapter to use RestClient interface

Author: rmcdouga

rest-services/client/src/main/java/com/_4point/aem/docservices/rest_services/client/generatePDF/RestServicesGeneratePDFServiceAdapter.java

@@ -1,29 +1,29 @@
-package com._4point.aem.docservices.rest_services.client.generatePDF;
+ package com._4point.aem.docservices.rest_services.client.generatePDF;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Base64;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status.Family;
-import jakarta.ws.rs.core.Response.StatusType;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
+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.MultipartPayload;
+import com._4point.aem.docservices.rest_services.client.RestClient.Response;
+import com._4point.aem.docservices.rest_services.client.RestClient.RestClientException;
+import com._4point.aem.docservices.rest_services.client.helpers.AemConfig;
 import com._4point.aem.docservices.rest_services.client.helpers.AemServerType;
 import com._4point.aem.docservices.rest_services.client.helpers.Builder;
 import com._4point.aem.docservices.rest_services.client.helpers.BuilderImpl;
-import com._4point.aem.docservices.rest_services.client.helpers.MultipartTransformer;
+import com._4point.aem.docservices.rest_services.client.helpers.BuilderImpl.TriFunction;
 import com._4point.aem.docservices.rest_services.client.helpers.RestServicesServiceAdapter;
 import com._4point.aem.fluentforms.api.Document;
 import com._4point.aem.fluentforms.api.generatePDF.CreatePDFResult;
@@ -46,81 +46,47 @@ public class RestServicesGeneratePDFServiceAdapter extends RestServicesServiceAd
 	private static final String SETTING_DOC = "settingDoc";
 	private static final String XMP_DOC = "xmpDoc";
 
-//	protected RestServicesGeneratePDFServiceAdapter(WebTarget baseTarget) {
-//		super(baseTarget);
-//	}
-//
+
+	private final RestClient createPdf2RestClient;
+
 	// Only callable from Builder
-	private RestServicesGeneratePDFServiceAdapter(WebTarget target, Supplier<String> correlationId, AemServerType aemServerType) {
-		super(target, correlationId, aemServerType);
+	private RestServicesGeneratePDFServiceAdapter(BuilderImpl builder, Supplier<String> correlationId) {
+		super(correlationId);
+		this.createPdf2RestClient = builder.createClient(GENERATE_PDF_SERVICE_NAME, CREATE_PDF_METHOD_NAME);
 	}
 
-	@Override
-	public CreatePDFResult createPDF2(Document inputDoc, String inputFileExtension, String fileTypeSettings,
-			PDFSettings pdfSettings, SecuritySettings securitySettings, Document settingsDoc, Document xmpDoc)
-			throws GeneratePDFServiceException {
-		WebTarget geneWebTarget = baseTarget.path(constructStandardPath(GENERATE_PDF_SERVICE_NAME, CREATE_PDF_METHOD_NAME));
-
-		try (final FormDataMultiPart multipart = new FormDataMultiPart()) {
-			multipart.field(DATA_PARAM_NAME,
-					Objects.requireNonNull(inputDoc, "inputDoc can not be null").getInputStream(),
-					MediaType.MULTIPART_FORM_DATA_TYPE);
-			multipart.field(FILE_EXTENSION,
-					Objects.requireNonNull(inputFileExtension, "file extension can not be null"));
-
-			byte[] settingsData = settingsDoc != null ? settingsDoc.getInlineData() : null;
-			byte[] xmpDocData = xmpDoc != null ? xmpDoc.getInlineData() : null;
-			MultipartTransformer.create(multipart)
-					.transform((t) -> fileTypeSettings == null ? t : t.field(FILE_TYPE_SETTINGS, fileTypeSettings))
-					.transform((t) -> pdfSettings == null ? t : t.field(PDF_SETTINGS, pdfSettings.toString()))
-					.transform((t) -> securitySettings == null ? t
-							: t.field(SECURITY_SETTINGS, securitySettings.toString()))
-					.transform((t) -> settingsData == null ? t
-							: t.field(SETTING_DOC, settingsData, MediaType.MULTIPART_FORM_DATA_TYPE))
-					.transform((t) -> xmpDocData == null ? t
-							: t.field(XMP_DOC, xmpDocData, MediaType.MULTIPART_FORM_DATA_TYPE));
-			
-			Response result = postToServer(geneWebTarget, multipart, MediaType.APPLICATION_XML_TYPE);
-			StatusType resultStatus = result.getStatusInfo();
-			if (!Family.SUCCESSFUL.equals(resultStatus.getFamily())) {
-				String msg = "Call to server failed, statusCode='" + resultStatus.getStatusCode() + "', reason='"
-						+ resultStatus.getReasonPhrase() + "'.";
-				if (result.hasEntity()) {
-					InputStream entityStream = (InputStream) result.getEntity();
-					msg += "\n" + inputStreamtoString(entityStream);
-				}
-				throw new GeneratePDFServiceException(msg);
-			}
-
-			if (!result.hasEntity()) {
-				throw new GeneratePDFServiceException(
-						"Call to server succeeded but server failed to return createPDFResult xml.  This should never happen.");
-			}
-
-			MediaType responseContentType = result.getMediaType();
-
-			if (responseContentType == null || !responseContentType.isCompatible(MediaType.APPLICATION_XML_TYPE)) {
-				String msg = "Response from AEM server was  "
-						+ (responseContentType != null ? "content-type='" + responseContentType.toString() + "'"
-								: "content-type was null")
-						+ ".";
-				InputStream entityStream = (InputStream) result.getEntity();
-				msg += "\n" + inputStreamtoString(entityStream);
-				throw new GeneratePDFServiceException(msg);
-			}
-			CreatePDFResult createPDFResult = convertXmlToCreatePDFResult((InputStream) result.getEntity());
-			return createPDFResult;
-		} catch (IOException e) {
-			throw new GeneratePDFServiceException(
-					"I/O Error while converting document to pdf. (" + baseTarget.getUri().toString() + ").", e);
-		} catch (RestServicesServiceException e) {
-			throw new GeneratePDFServiceException("Error while posting to server", e);
-		}
-	}
+    @Override
+    public CreatePDFResult createPDF2(Document inputDoc, String inputFileExtension, String fileTypeSettings,
+                                      PDFSettings pdfSettings, SecuritySettings securitySettings, Document settingsDoc, Document xmpDoc)
+            throws GeneratePDFServiceException {
+        try (MultipartPayload payload = createPdf2RestClient.multipartPayloadBuilder()
+                .add(DATA_PARAM_NAME, Objects.requireNonNull(inputDoc, "inputDoc can not be null"), ContentType.APPLICATION_OCTET_STREAM)
+                .add(FILE_EXTENSION, Objects.requireNonNull(inputFileExtension, "file extension can not be null"))
+                .addIfNotNull(FILE_TYPE_SETTINGS, fileTypeSettings)
+                .addStringVersion(PDF_SETTINGS, pdfSettings)
+                .addStringVersion(SECURITY_SETTINGS, securitySettings)
+                .addIfNotNull(SETTING_DOC, settingsDoc, ContentType.APPLICATION_XML)
+                .addIfNotNull(XMP_DOC, xmpDoc, ContentType.APPLICATION_XML)
+                .build()) {
+
+            Optional<Response> postToServerResult = payload.postToServer(ContentType.APPLICATION_XML);
+            
+			return postToServerResult
+            			  .map(RestServicesServiceAdapter::responseToDoc)
+            			  .map(uncheck(Document::getInputStream))
+                    	  .map(RestServicesGeneratePDFServiceAdapter::convertXmlToCreatePDFResult)
+                    	  .orElseThrow(() -> new GeneratePDFServiceException("Error - empty response from AEM server."));
+        } catch (IOException e) {
+            throw new GeneratePDFServiceException("I/O Error while generating PDF. (" + createPdf2RestClient.target() + ").", e);
+        } catch (RestClientException e) {
+            throw new GeneratePDFServiceException("Error while POSTing to server (" + createPdf2RestClient.target() + ").", e);
+        } catch (GeneratePDFServiceResponseParsingException e) {
+            throw new GeneratePDFServiceException("Error while converting server response to PdfResult.", e);
+        }
+    }
 
 	// Package visibility so that it can be unit tested.
-	/* package */public static CreatePDFResult convertXmlToCreatePDFResult(InputStream createPDFResultXml)
-			throws GeneratePDFServiceException {
+	/* package */ static CreatePDFResult convertXmlToCreatePDFResult(InputStream createPDFResultXml) throws GeneratePDFServiceResponseParsingException {
 		CreatePDFResultImpl createPDFResult = new CreatePDFResultImpl();
 		try {
 			DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@@ -130,7 +96,7 @@ public CreatePDFResult createPDF2(Document inputDoc, String inputFileExtension,
 			getNodeValueForAttribute(doc, "logDoc", "logDocValue", createPDFResult);
 
 		} catch (ParserConfigurationException | SAXException | IOException e) {
-			throw new GeneratePDFServiceException("Error while parsing xml", e);
+			throw new GeneratePDFServiceResponseParsingException("Error while parsing xml", e);
 		}
 		return createPDFResult;
 	}
@@ -141,19 +107,23 @@ private static void getNodeValueForAttribute(org.w3c.dom.Document doc, String pa
 		byte[] bytesJobLog = Base64.getDecoder().decode(eElement.getAttribute(attributeName));
 		if (parentNodeName.equals("createdDoc")) {
 			createPDFResult.setCreatedDocument(SimpleDocumentFactoryImpl.getFactory().create(bytesJobLog));
-			createPDFResult.getCreatedDocument().setContentType(APPLICATION_PDF.toString());
+			createPDFResult.getCreatedDocument().setContentType(ContentType.APPLICATION_PDF.contentType());
 		} else {
 			createPDFResult.setLogDocument(SimpleDocumentFactoryImpl.getFactory().create(bytesJobLog));
-			createPDFResult.getLogDocument().setContentType(MediaType.TEXT_PLAIN_TYPE.toString());
+			createPDFResult.getLogDocument().setContentType(ContentType.TEXT_PLAIN.contentType());
 		}
 	}
 
-	public static GeneratePDFServiceBuilder builder() {
-		return new GeneratePDFServiceBuilder();
+	public static GeneratePDFServiceBuilder builder(TriFunction<AemConfig, String, Supplier<String>, RestClient> clientFactory) {
+		return new GeneratePDFServiceBuilder(clientFactory);
 	}
 
 	public static class GeneratePDFServiceBuilder implements Builder {
-		private BuilderImpl builder = new BuilderImpl();
+		private BuilderImpl builder;
+
+		public GeneratePDFServiceBuilder(TriFunction<AemConfig, String, Supplier<String>, RestClient> clientFactory) {
+			this.builder = new BuilderImpl(clientFactory);
+		}
 
 		@Override
 		public GeneratePDFServiceBuilder machineName(String machineName) {
@@ -173,12 +143,6 @@ public GeneratePDFServiceBuilder useSsl(boolean useSsl) {
 			return this;
 		}
 
-		@Override
-		public GeneratePDFServiceBuilder clientFactory(Supplier<Client> clientFactory) {
-			builder.clientFactory(clientFactory);
-			return this;
-		}
-
 		@Override
 		public GeneratePDFServiceBuilder basicAuthentication(String username, String password) {
 			builder.basicAuthentication(username, password);
@@ -196,11 +160,6 @@ public Supplier<String> getCorrelationIdFn() {
 			return builder.getCorrelationIdFn();
 		}
 
-		@Override
-		public WebTarget createLocalTarget() {
-			return builder.createLocalTarget();
-		}
-
 		@Override
 		public GeneratePDFServiceBuilder aemServerType(AemServerType serverType) {
 			builder.aemServerType(serverType);
@@ -213,9 +172,15 @@ public AemServerType getAemServerType() {
 		}
 
 		public RestServicesGeneratePDFServiceAdapter build() {
-			return new RestServicesGeneratePDFServiceAdapter(this.createLocalTarget(), this.getCorrelationIdFn(), this.getAemServerType());
+			return new RestServicesGeneratePDFServiceAdapter(builder, this.getCorrelationIdFn());
 		}
-
 	}
 
+	@SuppressWarnings("serial")
+	private static class GeneratePDFServiceResponseParsingException extends RuntimeException {
+
+		public GeneratePDFServiceResponseParsingException(String message, Throwable cause) {
+			super(message, cause);
+		}
+	}
 }