♻️ Modified services to explicitly use AdobeDocumentFactoryImpl

The rest-services code used DocumentFactory.getDefault() which obscured
which implementation was being used (even though it was always
AdobeDocumentFactoryImpl).  Since we know that rest-services will be
running on an AEM server (and will therefore always have
AdobeDocumentImpl available) we might as well call it explicitly so that
it's obvious which implementation is being used.

Author: rmcdouga

fluentforms/core/src/main/java/com/_4point/aem/fluentforms/api/DocumentFactory.java

@@ -104,6 +104,7 @@ public interface DocumentFactory {
 	 * 
 	 * @return
 	 */
+	@Deprecated
 	public static DocumentFactory getDefault() {
 		return AdobeDocumentFactoryImpl.getFactory();
 	}

rest-services/pom.xml

@@ -594,6 +594,16 @@
 			<artifactId>4point-hamcrest-matchers</artifactId>
 			<version>${_4point-hamcrest-matchers.version}</version>
 			<scope>test</scope>
+            <exclusions> <!-- Exclude older versions of hamcrest use the explicit one. -->
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-library</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/assembler/AssembleDocuments.java

@@ -51,6 +51,7 @@
 import com._4point.aem.fluentforms.api.assembler.LogLevel;
 import com._4point.aem.fluentforms.api.assembler.AssemblerService.AssemblerArgumentBuilder;
 import com._4point.aem.fluentforms.api.assembler.AssemblerService.AssemblerServiceException;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.UsageContext;
 import com._4point.aem.fluentforms.impl.assembler.AdobeAssemblerServiceAdapter;
 import com._4point.aem.fluentforms.impl.assembler.AssemblerServiceImpl;
@@ -80,7 +81,7 @@ public class AssembleDocuments extends SlingAllMethodsServlet {
 
 	private final Supplier<TraditionalDocAssemblerService> assemblerServiceFactory = this::getAdobeAssemblerService;
 
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 
 	@Override
 	protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/assembler/IsPdfA.java

@@ -23,6 +23,7 @@
 import com._4point.aem.docservices.rest_services.server.Exceptions.NotAcceptableException;
 import com._4point.aem.fluentforms.api.DocumentFactory;
 import com._4point.aem.fluentforms.api.assembler.AssemblerService;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.UsageContext;
 import com._4point.aem.fluentforms.impl.assembler.AdobeAssemblerServiceAdapter;
 import com._4point.aem.fluentforms.impl.assembler.AssemblerServiceImpl;
@@ -41,7 +42,7 @@ public class IsPdfA  extends SlingAllMethodsServlet {
 
 	private final Supplier<TraditionalDocAssemblerService> assemblerServiceFactory = this::getAdobeAssemblerService;
 
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 
 	private TraditionalDocAssemblerService getAdobeAssemblerService() {
 		return new AdobeAssemblerServiceAdapter(adobeAssembleService, docFactory);

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/assembler/ToPdfA.java

@@ -39,6 +39,7 @@
 import com._4point.aem.fluentforms.api.assembler.AssemblerService.AssemblerServiceException;
 import com._4point.aem.fluentforms.api.assembler.LogLevel;
 import com._4point.aem.fluentforms.api.assembler.PDFAConversionResult;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.UsageContext;
 import com._4point.aem.fluentforms.impl.assembler.AdobeAssemblerServiceAdapter;
 import com._4point.aem.fluentforms.impl.assembler.AssemblerServiceImpl;
@@ -75,7 +76,7 @@ public class ToPdfA  extends SlingAllMethodsServlet {
 
 	private final Supplier<TraditionalDocAssemblerService> assemblerServiceFactory = this::getAdobeAssemblerService;
 
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 
 	private TraditionalDocAssemblerService getAdobeAssemblerService() {
 		return new AdobeAssemblerServiceAdapter(adobeAssembleService, docFactory);

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/convertPdf/ToImage.java

@@ -33,6 +33,7 @@
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService;
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService.ConvertPdfServiceException;
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService.ToImageArgumentBuilder;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.convertPdf.AdobeConvertPdfServiceAdapter;
 import com._4point.aem.fluentforms.impl.convertPdf.ConvertPdfServiceImpl;
 import com._4point.aem.fluentforms.impl.convertPdf.TraditionalConvertPdfService;
@@ -56,7 +57,7 @@ public class ToImage extends SlingAllMethodsServlet {
 
 	private static final Logger log = LoggerFactory.getLogger(ToImage.class);
 	private static final String IMAGE_PARAM = "IMAGE";
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 	private final Supplier<TraditionalConvertPdfService> convertPdfServiceFactory = this::getAdobeConvertPdfService;
 
 	@Reference

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/convertPdf/ToPS.java

@@ -29,6 +29,7 @@
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService;
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService.ConvertPdfServiceException;
 import com._4point.aem.fluentforms.api.convertPdf.ConvertPdfService.ToPSArgumentBuilder;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.convertPdf.AdobeConvertPdfServiceAdapter;
 import com._4point.aem.fluentforms.impl.convertPdf.ConvertPdfServiceImpl;
 import com._4point.aem.fluentforms.impl.convertPdf.TraditionalConvertPdfService;
@@ -46,7 +47,7 @@
 public class ToPS extends SlingAllMethodsServlet {
 
 	private static final Logger log = LoggerFactory.getLogger(ToPS.class);
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 	private final Supplier<TraditionalConvertPdfService> convertPdfServiceFactory = this::getAdobeConvertPdfService;
 
 	@Reference

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/docassurance/SecureDocument.java

@@ -30,6 +30,7 @@
 import com._4point.aem.fluentforms.api.DocumentFactory;
 import com._4point.aem.fluentforms.api.docassurance.DocAssuranceService;
 import com._4point.aem.fluentforms.api.docassurance.DocAssuranceService.DocAssuranceServiceException;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.docassurance.AdobeDocAssuranceServiceAdapter;
 import com._4point.aem.fluentforms.impl.docassurance.DocAssuranceServiceImpl;
 import com._4point.aem.fluentforms.impl.docassurance.TraditionalDocAssuranceService;
@@ -42,7 +43,7 @@ public class SecureDocument extends SlingAllMethodsServlet {
 
 	private static final Logger log = LoggerFactory.getLogger(SecureDocument.class);
 
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 	private Supplier<TraditionalDocAssuranceService> docAssuranceServiceFactory = this::getAdobeDocAssuranceService;
 	private ResourceResolver resourceResolver;
 

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/forms/ExportData.java

@@ -30,6 +30,7 @@
 import com._4point.aem.fluentforms.api.DocumentFactory;
 import com._4point.aem.fluentforms.api.forms.FormsService;
 import com._4point.aem.fluentforms.api.forms.FormsService.FormsServiceException;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.UsageContext;
 import com._4point.aem.fluentforms.impl.forms.AdobeFormsServiceAdapter;
 import com._4point.aem.fluentforms.impl.forms.FormsServiceImpl;
@@ -51,7 +52,7 @@ public class ExportData extends SlingAllMethodsServlet {
 
 	private static final Logger log = LoggerFactory.getLogger(ExportData.class);
 
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 	private final Supplier<TraditionalFormsService> formServiceFactory = this::getAdobeFormsService;
 
 	@Reference

rest-services/server/src/main/java/com/_4point/aem/docservices/rest_services/server/forms/ImportData.java

@@ -30,6 +30,7 @@
 import com._4point.aem.fluentforms.api.DocumentFactory;
 import com._4point.aem.fluentforms.api.forms.FormsService;
 import com._4point.aem.fluentforms.api.forms.FormsService.FormsServiceException;
+import com._4point.aem.fluentforms.impl.AdobeDocumentFactoryImpl;
 import com._4point.aem.fluentforms.impl.UsageContext;
 import com._4point.aem.fluentforms.impl.forms.AdobeFormsServiceAdapter;
 import com._4point.aem.fluentforms.impl.forms.FormsServiceImpl;
@@ -44,7 +45,7 @@ public class ImportData extends SlingAllMethodsServlet {
 	private static final String PDF_PARAM_NAME = "pdf";
 	private static final String DATA_PARAM_NAME = "data";
 	private static final Logger log = LoggerFactory.getLogger(ImportData.class);
-	private final DocumentFactory docFactory = DocumentFactory.getDefault();
+	private final DocumentFactory docFactory = AdobeDocumentFactoryImpl.getFactory();	// We know we're running on AEM, so we'll use the AdobeDocumentFactoryImpl.
 	private final Supplier<TraditionalFormsService> formServiceFactory = this::getAdobeFormsService;
 
 	@Reference