✅ Fix failing test after implementing fix for #32

After updating the code, I tested using the integration tests but failed
to update the unit tests.  The mocks needed to be updated to reflect the
change in the code.

Author: rmcdouga

rest-services/client/src/test/java/com/_4point/aem/docservices/rest_services/client/forms/RestServicesFormsServiceAdapterTest.java

@@ -180,7 +180,7 @@ void testRenderPDFForm_HappyPaths(RenderFormsHappyPath codePath) throws Exceptio
 		when(mockPayloadBuilder.addIfNotNull(eq("data"), codePath.hasData ? same(data) : isNull(), eq(ContentType.APPLICATION_XML))).thenReturn(mockPayloadBuilder);
 		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.acrobatVersion"), eq(pdfFormRenderOptions.getAcrobatVersion()))).thenReturn(mockPayloadBuilder);
 		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.cacheStrategy"), eq(pdfFormRenderOptions.getCacheStrategy()))).thenReturn(mockPayloadBuilder);
-		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.contentRoot"), eq(pdfFormRenderOptions.getContentRoot()))).thenReturn(mockPayloadBuilder);
+		when(mockPayloadBuilder.addStringVersionOfPath(eq("renderOptions.contentRoot"), eq(pdfFormRenderOptions.getContentRoot()))).thenReturn(mockPayloadBuilder);
 		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.debugDir"), eq(pdfFormRenderOptions.getDebugDir()))).thenReturn(mockPayloadBuilder);
 		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.embedFonts"), eq(pdfFormRenderOptions.getEmbedFonts()))).thenReturn(mockPayloadBuilder);
 		when(mockPayloadBuilder.addStringVersion(eq("renderOptions.locale"), eq(pdfFormRenderOptions.getLocale()))).thenReturn(mockPayloadBuilder);

rest-services/client/src/test/java/com/_4point/aem/docservices/rest_services/client/output/RestServicesOutputServiceAdapterTest.java

@@ -185,7 +185,7 @@ void testGeneratePDFOutput_HappyPath(HappyPaths codePath) throws Exception {
 
 			// Setup the expected calls to mockPayloadBuilder
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.acrobatVersion"), eq(AcrobatVersion.Acrobat_10_1))).thenReturn(mockPayloadBuilder);
-			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.contentRoot"), Mockito.any(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
+			when(mockPayloadBuilder.addStringVersionOfPath(eq("outputOptions.contentRoot"), Mockito.any(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.debugDir"), Mockito.any(Path.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.embedFonts"), eq(Boolean.TRUE))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.linearizedPdf"), eq(Boolean.TRUE))).thenReturn(mockPayloadBuilder);
@@ -196,7 +196,7 @@ void testGeneratePDFOutput_HappyPath(HappyPaths codePath) throws Exception {
 			when(mockPayloadBuilder.addIfNotNull(eq("outputOptions.xci"), Mockito.any(Document.class), eq(ContentType.APPLICATION_XML))).thenReturn(mockPayloadBuilder);
 		} else {
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.acrobatVersion"), isNull(AcrobatVersion.class))).thenReturn(mockPayloadBuilder);
-			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.contentRoot"), isNull(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
+			when(mockPayloadBuilder.addStringVersionOfPath(eq("outputOptions.contentRoot"), isNull(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.debugDir"), isNull(Path.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.embedFonts"), eq(Boolean.FALSE))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.linearizedPdf"), eq(Boolean.FALSE))).thenReturn(mockPayloadBuilder);
@@ -226,7 +226,7 @@ void testGeneratePrintedOutput_HappyPath(HappyPaths codePath) throws Exception {
 			when(printedOutputOptions.getXci()).thenReturn(Mockito.mock(Document.class));
 
 			// Setup the expected calls to mockPayloadBuilder
-			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.contentRoot"), Mockito.any(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
+			when(mockPayloadBuilder.addStringVersionOfPath(eq("outputOptions.contentRoot"), Mockito.any(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.copies"), eq(Integer.valueOf(1)))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.debugDir"), Mockito.any(Path.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.locale"), eq(Locale.CANADA_FRENCH))).thenReturn(mockPayloadBuilder);
@@ -237,7 +237,7 @@ void testGeneratePrintedOutput_HappyPath(HappyPaths codePath) throws Exception {
 			// Mandatory entry in PrintedOutputOptions.
 			when(printedOutputOptions.getPrintConfig()).thenReturn(PrintConfig.HP_PCL_5e);
 
-			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.contentRoot"), isNull(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
+			when(mockPayloadBuilder.addStringVersionOfPath(eq("outputOptions.contentRoot"), isNull(PathOrUrl.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.copies"), eq(Integer.valueOf(0)))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.debugDir"), isNull(Path.class))).thenReturn(mockPayloadBuilder);
 			when(mockPayloadBuilder.addStringVersion(eq("outputOptions.locale"), isNull(Locale.class))).thenReturn(mockPayloadBuilder);