Skip to content

Commit 200a215

Browse files
rmcdougarmcdouga
committed
🎨 Updated classes broken by changes in the rest-services client code.
1 parent aba94fc commit 200a215

5 files changed

Lines changed: 33 additions & 8 deletions

File tree

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/client/assembler/AssemblerServiceTestHelper.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com._4point.aem.docservices.rest_services.client.assembler;
2+
3+
import java.io.InputStream;
4+
5+
import com._4point.aem.fluentforms.api.assembler.AssemblerResult;
6+
7+
public class AssemblerServiceTestHelper {
8+
// This is a helper message that makes the package private convertXmlToAssemblerResult() available to the server tests.
9+
public static AssemblerResult convertXmlToAssemblerResult(InputStream assemblerResultXml) throws Exception {
10+
return RestServicesDocAssemblerServiceAdapter.convertXmlToAssemblerResult(assemblerResultXml);
11+
}
12+
}

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/client/generatePDF/GeneratePDFServiceTestHelper.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com._4point.aem.docservices.rest_services.client.generatePDF;
2+
3+
import java.io.InputStream;
4+
5+
import com._4point.aem.fluentforms.api.generatePDF.CreatePDFResult;
6+
7+
public class GeneratePDFServiceTestHelper {
8+
public static CreatePDFResult convertXmlToCreatePDFResult(InputStream createPDFResultXml) throws Exception {
9+
// This is a helper message that makes the package private convertXmlToCreatePDFResult() available to the server tests.
10+
return RestServicesGeneratePDFServiceAdapter.convertXmlToCreatePDFResult(createPDFResultXml);
11+
}
12+
}

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/Pdf.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.HashSet;
99
import java.util.Set;
1010

11+
import org.apache.pdfbox.Loader;
1112
import org.apache.pdfbox.cos.COSArray;
1213
import org.apache.pdfbox.cos.COSBase;
1314
import org.apache.pdfbox.cos.COSDictionary;
@@ -119,15 +120,15 @@ public String getProducer() {
119120
}
120121
public static Pdf from(byte[] docBytes) throws PdfException {
121122
try {
122-
return new Pdf(PDDocument.load(docBytes));
123+
return new Pdf(Loader.loadPDF(docBytes));
123124
} catch (IOException e) {
124125
throw new PdfException(e);
125126
}
126127
}
127128

128129
public static Pdf from(InputStream docStream) throws PdfException {
129130
try {
130-
return new Pdf(PDDocument.load(docStream));
131+
return new Pdf(Loader.loadPDF(docStream.readAllBytes()));
131132
} catch (IOException e) {
132133
throw new PdfException(e);
133134
}

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/server/assembler/AssembleDocumentsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
3131

32-
import com._4point.aem.docservices.rest_services.client.assembler.RestServicesDocAssemblerServiceAdapter;
32+
import com._4point.aem.docservices.rest_services.client.assembler.AssemblerServiceTestHelper;
3333
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
3434
import com._4point.aem.fluentforms.api.Document;
3535
import com._4point.aem.fluentforms.api.assembler.AssemblerResult;
@@ -88,7 +88,7 @@ void testAssembleDocuments_AllArgs() throws Exception {
8888
assertTrue(result.hasEntity(), "Expected the response to have an entity.");
8989
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus(), () -> "Expected response to be 'OK', entity='" + TestUtils.readEntityToString(result) + "'.");
9090

91-
AssemblerResult assemblerResult = RestServicesDocAssemblerServiceAdapter.convertXmlToAssemblerResult((InputStream) result.getEntity());
91+
AssemblerResult assemblerResult = AssemblerServiceTestHelper.convertXmlToAssemblerResult((InputStream) result.getEntity());
9292
Map<String, Document> resultDocument = assemblerResult.getDocuments();
9393
byte[] resultByte = null;
9494
for(Entry<String, Document> entry: resultDocument.entrySet()) {
@@ -124,7 +124,7 @@ void testAssembleDocuments_JustWithDDXandInputDocuments() throws Exception {
124124
assertTrue(result.hasEntity(), "Expected the response to have an entity.");
125125
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus(), () -> "Expected response to be 'OK', entity='" + TestUtils.readEntityToString(result) + "'.");
126126

127-
AssemblerResult assemblerResult = RestServicesDocAssemblerServiceAdapter.convertXmlToAssemblerResult((InputStream) result.getEntity());
127+
AssemblerResult assemblerResult = AssemblerServiceTestHelper.convertXmlToAssemblerResult((InputStream) result.getEntity());
128128
Map<String, Document> sourceDocuments = assemblerResult.getDocuments();
129129
byte[] resultByte = null;
130130
for(Entry<String, Document> entry: sourceDocuments.entrySet()) {

‎rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/server/generatePDF/GeneratePDFTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.api.BeforeEach;
2727
import org.junit.jupiter.api.Test;
2828

29-
import com._4point.aem.docservices.rest_services.client.generatePDF.RestServicesGeneratePDFServiceAdapter;
29+
import com._4point.aem.docservices.rest_services.client.generatePDF.GeneratePDFServiceTestHelper;
3030
import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
3131
import com._4point.aem.fluentforms.api.generatePDF.CreatePDFResult;
3232
import com._4point.aem.fluentforms.impl.generatePDF.PDFSettings;
@@ -68,7 +68,7 @@ void testGeneratePdf_AllArgs() throws Exception {
6868
assertTrue(result.hasEntity(), "Expected the response to have an entity.");
6969
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus(), () -> "Expected response to be 'OK', entity='" + TestUtils.readEntityToString(result) + "'.");
7070

71-
CreatePDFResult createPDFResult = RestServicesGeneratePDFServiceAdapter.convertXmlToCreatePDFResult((InputStream) result.getEntity());
71+
CreatePDFResult createPDFResult = GeneratePDFServiceTestHelper.convertXmlToCreatePDFResult((InputStream) result.getEntity());
7272
byte[] resultBytes = createPDFResult.getCreatedDocument().getInlineData();
7373
assertNotNull(createPDFResult.getCreatedDocument().getInlineData());
7474
assertEquals(APPLICATION_PDF.toString(),createPDFResult.getCreatedDocument().getContentType());
@@ -89,7 +89,7 @@ void testGeneratePdf_JustDataAndFileExtension() throws Exception {
8989
assertTrue(result.hasEntity(), "Expected the response to have an entity.");
9090
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus(), () -> "Expected response to be 'OK', entity='" + TestUtils.readEntityToString(result) + "'.");
9191

92-
CreatePDFResult createPDFResult = RestServicesGeneratePDFServiceAdapter.convertXmlToCreatePDFResult((InputStream) result.getEntity());
92+
CreatePDFResult createPDFResult = GeneratePDFServiceTestHelper.convertXmlToCreatePDFResult((InputStream) result.getEntity());
9393
byte[] resultBytes = createPDFResult.getCreatedDocument().getInlineData();
9494
assertNotNull(createPDFResult.getCreatedDocument().getInlineData());
9595
assertEquals(APPLICATION_PDF.toString(),createPDFResult.getCreatedDocument().getContentType());

0 commit comments

Comments
 (0)