Pull request #12: RED-6280: Performance Test Issue with OCR-Service

Merge in RED/ocr-service from RED-6280 to master

* commit '742725834933ad74ad582366b2b62015524bedb3':
  RED-6280:  Performance Test Issue with OCR-Service *removed init/terminate calls again *manual memory cleanup at every opportunity

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java

@@ -1,14 +1,12 @@
 package com.iqser.red.service.ocr.v1.server.initializer;
 
-import javax.annotation.PostConstruct;
-
+import com.pdftron.pdf.PDFNet;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.pdftron.pdf.PDFNet;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
+import javax.annotation.PostConstruct;
 
 @Component
 @RequiredArgsConstructor
@@ -29,7 +27,5 @@ public class PDFNetInitializer {
         PDFNet.setTempPath("/tmp/pdftron");
         PDFNet.addResourceSearchPath(ocrModulePath);
         PDFNet.initialize(pdftronLicense);
-
     }
-
 }

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/ImagePositionRetrievalService.java

@@ -47,16 +47,17 @@ public class ImagePositionRetrievalService {
         ElementReader reader = new ElementReader();
         for (int pageId = 1; pageId <= pdfDoc.getPageCount(); ++pageId) {
             RectCollection imagePositions = new RectCollection();
-            reader.begin(pdfDoc.getPage(pageId));
 
+            reader.begin(pdfDoc.getPage(pageId));
             findImagePositionsOnPage(reader, imagePositions, pdfDoc.getPage(pageId), mirrorY);
             imagePositions = mergeOverlappingRects(imagePositions);
-
             reader.end();
+
             if (imagePositions.getNumRects() > 0) {
                 pageIdToImagePositions.put(pageId, imagePositions);
             }
         }
+        reader.destroy();
         return pageIdToImagePositions;
     }
 

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/InvisibleElementRemovalService.java

@@ -77,7 +77,6 @@ public class InvisibleElementRemovalService {
 
             visitedXObjIds.add(page.getSDFObj().getObjNum());
 
-
             InvisibleElementRemovalContext context = InvisibleElementRemovalContext.builder()
                     .reader(reader)
                     .clippingPathStack(new ClippingPathStack(page.getMediaBox()))
@@ -92,8 +91,20 @@ public class InvisibleElementRemovalService {
             context.visitedXObjIds().clear();
 
             removeOverlappedElements(page, writer, context);
+            reader.end();
+            writer.end();
         }
-        pdfDoc.save(out, SDFDoc.SaveMode.REMOVE_UNUSED, null);
+
+        try {
+            pdfDoc.save(out, SDFDoc.SaveMode.LINEARIZED, null);
+        } catch (Exception e) {
+            log.error("File could not be saved after invisible element removal");
+            throw new RuntimeException(e);
+        }
+
+        writer.destroy();
+        reader.destroy();
+        pdfDoc.close();
     }
 
 
@@ -216,13 +227,14 @@ public class InvisibleElementRemovalService {
             formWriter.setDefaultGState(context.reader());
 
             processElements(formWriter, context);
-            formWriter.end();
+            formWriter.destroy();
             context.reader().end();
         }
     }
 
 
     private void processPath(Element pathElement, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
+
         PathData pathData = pathElement.getPathData();
 
         if (pathData.getOperators().length == 0 && pathData.getPoints().length == 0) {
@@ -352,7 +364,7 @@ public class InvisibleElementRemovalService {
             formWriter.setDefaultGState(context.reader());
 
             processOverlappedElements(formWriter, context);
-            formWriter.end();
+            formWriter.destroy();
             context.reader().end();
         }
     }
@@ -427,6 +439,9 @@ public class InvisibleElementRemovalService {
         rect.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
         rect.getGState().setStrokeColor(colorPt);
         writer.writePlacedElement(rect);
+
+        colorPt.destroy();
+        eb.destroy();
     }
 
 

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OCRService.java

@@ -1,34 +1,23 @@
 package com.iqser.red.service.ocr.v1.server.service;
 
-import static java.lang.String.format;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.ocr.v1.api.model.OCRStatusUpdateResponse;
 import com.iqser.red.service.ocr.v1.server.configuration.MessagingConfiguration;
 import com.iqser.red.service.ocr.v1.server.settings.OcrServiceSettings;
 import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.OCRModule;
-import com.pdftron.pdf.OCROptions;
-import com.pdftron.pdf.Optimizer;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.RectCollection;
+import com.pdftron.pdf.*;
 import com.pdftron.sdf.SDFDoc;
-
 import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.util.Map;
+
+import static java.lang.String.format;
 
 @Slf4j
 @Service
@@ -67,17 +56,17 @@ public class OCRService {
 
         try (ByteArrayOutputStream transferOutputStream = new ByteArrayOutputStream()) {
             try (InputStream fileStream = fileStorageService.getOriginalFileAsStream(dossierId, fileId)) {
-                long start = System.currentTimeMillis();
+                long removalStart = System.currentTimeMillis();
                 log.debug("Start invisible element removal for file with dossierId {} and fileId {}", dossierId, fileId);
                 invisibleElementRemovalService.removeInvisibleElements(fileStream, transferOutputStream, false);
-                long end = System.currentTimeMillis();
-                log.debug("Invisible element removal successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, format("%.1f", (end - start) / 1000.0));
+                long removalEnd = System.currentTimeMillis();
+                log.debug("Invisible element removal successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, format("%.1f", (removalEnd - removalStart) / 1000.0));
             }
             try (InputStream transferInputStream = new ByteArrayInputStream(transferOutputStream.toByteArray())) {
-                long start = System.currentTimeMillis();
+                long ocrStart = System.currentTimeMillis();
                 runOcr(transferInputStream, out, fileId);
-                long end = System.currentTimeMillis();
-                log.info("ocr successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, format("%.1f", (end - start) / 1000.0));
+                long ocrEnd = System.currentTimeMillis();
+                log.info("ocr successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, format("%.1f", (ocrEnd - ocrStart) / 1000.0));
             }
         }
     }
@@ -94,7 +83,7 @@ public class OCRService {
         // When a page does not have a TextZone, PDFTron whites out the page. But, PDFTron scans it anyway, resulting in a longer runtime.
         // So, we need to remove pages without images.
         // Furthermore, creating a new document is *much* faster than reusing the same document and adding/removing pages one by one.
-        // Therefore, we create a new Document with a single page for every page that contains text.
+        // Therefore, we create a new Document with a single page for every page that contains an image.
         int numProcessedPages = 0;
         for (Integer pageId : pageIdToRectCollection.keySet()) {
             try {
@@ -109,6 +98,7 @@ public class OCRService {
                         getAllOcrTextZonesAsString(pageIdToRectCollection, pageId));
 
                 replaceOriginalPageWithOcrPage(pdfDoc, pageId, singlePagePdfDoc);
+
                 singlePagePdfDoc.close();
 
                 rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
@@ -139,6 +129,7 @@ public class OCRService {
             log.error("Processed File with fileId {} could not be saved", fileId);
             throw new RuntimeException(e);
         }
+        pdfDoc.close();
     }
 
 

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java

@@ -1,24 +1,23 @@
 package com.iqser.red.service.ocr.v1.server.service;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.springframework.amqp.AmqpRejectAndDontRequeueException;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.ocr.v1.api.model.DocumentRequest;
 import com.iqser.red.service.ocr.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.ocr.v1.server.configuration.MessagingConfiguration;
-
+import com.iqser.red.service.ocr.v1.server.initializer.PDFNetInitializer;
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.AmqpRejectAndDontRequeueException;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 @Slf4j
 @Service
@@ -58,7 +57,6 @@ public class OcrMessageReceiver {
         }
 
         fileStatusProcessingUpdateClient.ocrSuccessful(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-
     }
 
 

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java

@@ -0,0 +1,76 @@
+package com.iqser.red.service.ocr.v1.server;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.iqser.red.service.ocr.v1.server.utils.FileSystemBackedStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import com.pdftron.pdf.PDFNet;
+
+import lombok.SneakyThrows;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(AbstractTest.TestConfiguration.class)
+public class AbstractTest {
+
+    @Autowired
+    protected StorageService storageService;
+
+    @MockBean
+    protected RabbitTemplate rabbitTemplate;
+
+
+    @AfterAll
+    public static void terminatePDFNet() {
+        PDFNet.terminate();
+        System.out.println("PDFNet Terminated");
+    }
+
+
+    @SneakyThrows
+    public void dummyTest() {
+
+        // Build needs one test to not fail.
+        assertThat(1).isEqualTo(1);
+    }
+
+
+    @AfterEach
+    public void cleanupStorage() {
+
+        if (this.storageService instanceof FileSystemBackedStorageService) {
+            ((FileSystemBackedStorageService) this.storageService).clearStorage();
+        }
+    }
+
+
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
+    public static class TestConfiguration {
+
+        @Bean
+        @Primary
+        public StorageService inMemoryStorage() {
+
+            return new FileSystemBackedStorageService();
+        }
+
+    }
+}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java

@@ -1,86 +1,49 @@
 package com.iqser.red.service.ocr.v1.server;
 
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfTextExtraction.extractAllTextFromDocument;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.ocr.v1.server.service.FileStorageService;
 import com.iqser.red.service.ocr.v1.server.service.OCRService;
-import com.iqser.red.service.ocr.v1.server.utils.FileSystemBackedStorageService;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
-import com.pdftron.common.PDFNetException;
 import com.pdftron.pdf.OCRModule;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.PageIterator;
-import com.pdftron.pdf.TextExtractor;
 
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.micrometer.prometheus.PrometheusTimer;
 import lombok.SneakyThrows;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT //
-        , properties = {"pdftron.ocrmodule.path=/YourOCRModulePath"})
-@Import(OcrServiceIntegrationTest.TestConfiguration.class)
-public class OcrServiceIntegrationTest {
-
-    @Autowired
-    protected StorageService storageService;
-
-    @Autowired
-    protected FileStorageService fileStorageService;
+@SpringBootTest(properties = {"pdftron.ocrmodule.path=/YourOCRModulePath"})
+public class OcrServiceIntegrationTest extends AbstractTest {
 
     @Autowired
     protected ObjectMapper objectMapper;
 
-    @MockBean
-    protected RabbitTemplate rabbitTemplate;
-
     @Autowired
     private OCRService ocrService;
 
     @Autowired
     private PrometheusMeterRegistry registry;
 
-
     @BeforeEach
     @SneakyThrows
-    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
+    @Disabled
     public void assertOCRModuleIsLoaded() {
-
         assert OCRModule.isModuleAvailable();
     }
 
-
     @Test
     @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
     public void testOCRMetrics() {
@@ -163,60 +126,11 @@ public class OcrServiceIntegrationTest {
         }
         try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
             ocrService.runOcrOnDocument("dossier", "file", out);
+            System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
         }
 
-        System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
         try (var fileStream = new FileInputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
             return extractAllTextFromDocument(fileStream);
         }
     }
-
-
-    private static String extractAllTextFromDocument(InputStream fileStream) throws IOException, PDFNetException {
-
-        PDFDoc pdfDoc = new PDFDoc(fileStream);
-        TextExtractor extractor = new TextExtractor();
-        List<String> texts = new ArrayList<>();
-
-        PageIterator iterator = pdfDoc.getPageIterator();
-        while (iterator.hasNext()) {
-            Page page = iterator.next();
-            extractor.begin(page);
-            texts.add(extractor.getAsText());
-        }
-
-        return String.join("\n", texts);
-    }
-
-
-    @SneakyThrows
-    public void dummyTest() {
-
-        // Build needs one test to not fail.
-        assertThat(1).isEqualTo(1);
-    }
-
-
-    @AfterEach
-    public void cleanupStorage() {
-
-        if (this.storageService instanceof FileSystemBackedStorageService) {
-            ((FileSystemBackedStorageService) this.storageService).clearStorage();
-        }
-    }
-
-
-    @Configuration
-    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
-    public static class TestConfiguration {
-
-        @Bean
-        @Primary
-        public StorageService inMemoryStorage() {
-
-            return new FileSystemBackedStorageService();
-        }
-
-    }
-
 }

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/service/ImagePositionRetrievalServiceTest.java

@@ -1,6 +1,8 @@
 package com.iqser.red.service.ocr.v1.server.service;
 
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfDraw.drawGrid;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfDraw.drawRectCollection;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.FileInputStream;
@@ -13,43 +15,24 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import com.iqser.red.service.ocr.v1.server.Application;
-import com.iqser.red.service.ocr.v1.server.OcrServiceIntegrationTest;
+import com.iqser.red.service.ocr.v1.server.AbstractTest;
 import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.ColorPt;
-import com.pdftron.pdf.ColorSpace;
-import com.pdftron.pdf.Element;
-import com.pdftron.pdf.ElementBuilder;
 import com.pdftron.pdf.ElementWriter;
 import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.Rect;
 import com.pdftron.pdf.RectCollection;
 import com.pdftron.sdf.SDFDoc;
 
 import lombok.SneakyThrows;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Import(OcrServiceIntegrationTest.TestConfiguration.class)
-class ImagePositionRetrievalServiceTest {
+
+class ImagePositionRetrievalServiceTest extends AbstractTest {
 
     @Autowired
     private ImagePositionRetrievalService imagePositionRetrievalService;
 
-    @MockBean
-    protected RabbitTemplate rabbitTemplate;
-
-
     @Test
     @SneakyThrows
     public void testImagePositionRetrievalForRotateTestFileWithImages() {
@@ -133,37 +116,38 @@ class ImagePositionRetrievalServiceTest {
 
     private List<int[]> testImagePositionDetection(String fileName) throws IOException, PDFNetException {
 
-        InputStream fileStream = new FileInputStream(new ClassPathResource("files/" + fileName + ".pdf").getFile().getAbsolutePath());
-        PDFDoc pdfDoc = new PDFDoc(fileStream);
+        try (InputStream fileStream = new FileInputStream(new ClassPathResource("files/" + fileName + ".pdf").getFile().getAbsolutePath())) {
+            PDFDoc pdfDoc = new PDFDoc(fileStream);
 
-        Map<Integer, RectCollection> pageIdToRectCollection = imagePositionRetrievalService.getImagePositionPerPage(pdfDoc, false);
+            Map<Integer, RectCollection> pageIdToRectCollection = imagePositionRetrievalService.getImagePositionPerPage(pdfDoc, false);
 
-        ElementWriter writer = new ElementWriter();
-        pageIdToRectCollection.forEach((pageId, rectCollection) -> {
-            try {
-                writer.begin(pdfDoc.getPage(pageId));
-                drawRectCollection(writer, rectCollection, pdfDoc.getPage(pageId));
-                drawGrid(writer, pdfDoc.getPage(pageId));
-                writer.end();
-                StringBuilder zonesString = new StringBuilder();
-                for (int j = 0; j < rectCollection.getNumRects(); ++j) {
-                    var r = rectCollection.getRectAt(j);
-                    zonesString.append(String.format("%d:[lower left (%.1f|%.1f) upper right (%.1f|%.1f)]; ", j, r.getX1(), r.getY1(), r.getX2(), r.getY2()));
+            ElementWriter writer = new ElementWriter();
+            pageIdToRectCollection.forEach((pageId, rectCollection) -> {
+                try {
+                    writer.begin(pdfDoc.getPage(pageId));
+                    drawRectCollection(writer, rectCollection);
+                    drawGrid(writer, pdfDoc.getPage(pageId));
+                    writer.end();
+                    StringBuilder zonesString = new StringBuilder();
+                    for (int j = 0; j < rectCollection.getNumRects(); ++j) {
+                        var r = rectCollection.getRectAt(j);
+                        zonesString.append(String.format("%d:[lower left (%.1f|%.1f) upper right (%.1f|%.1f)]; ", j, r.getX1(), r.getY1(), r.getX2(), r.getY2()));
+                    }
+                    System.out.printf("Page %d: rotation: %d OCR regions %s \n", pageId, pdfDoc.getPage(pageId).getRotation(), zonesString);
+                } catch (PDFNetException e) {
+                    throw new RuntimeException(e);
                 }
-                System.out.printf("Page %d: rotation: %d OCR regions %s \n", pageId, pdfDoc.getPage(pageId).getRotation(), zonesString);
-            } catch (PDFNetException e) {
-                throw new RuntimeException(e);
-            }
-        });
+            });
 
-        // Check visually for red Rectangles to match images in the saved pdf file
-        try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf")) {
-            out.write(pdfDoc.save(SDFDoc.SaveMode.LINEARIZED, null));
+            // Check visually for red Rectangles to match images in the saved pdf file
+            try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf")) {
+                out.write(pdfDoc.save(SDFDoc.SaveMode.LINEARIZED, null));
+            }
+            pdfDoc.close();
+            System.out.println("result file: " + getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf");
+            // round all coords to nearest int to account for inconsistencies with the calculation of the bounding box
+            return pageIdToRectCollection.values().stream().map(this::toRoundedCoordinateArrayList).flatMap(List::stream).collect(Collectors.toList());
         }
-        System.out.println("result file: " + getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf");
-        fileStream.close();
-        // round all coords to nearest int to account for inconsistencies with the calculation of the bounding box
-        return pageIdToRectCollection.values().stream().map(this::toRoundedCoordinateArrayList).flatMap(List::stream).collect(Collectors.toList());
     }
 
 
@@ -178,59 +162,4 @@ class ImagePositionRetrievalServiceTest {
         return coords;
     }
 
-
-    @SneakyThrows
-    private void drawGrid(ElementWriter writer, Page page) {
-
-        ElementBuilder eb = new ElementBuilder();
-        double dX = 15;
-        double dY = 15;
-        int nRows = (int) (page.getPageHeight() / dY) + 1;
-        int nCols = (int) (page.getPageWidth() / dX) + 1;
-        for (int row = 0; row < nRows; ++row) {
-            for (int col = 0; col < nCols; ++col) {
-                Element cell = eb.createRect(col * dX, row * dY, dX, dY);
-                cell.setPathStroke(true);
-                cell.getGState().setLineWidth(1);
-                cell.getGState().setStrokeOpacity(0.1);
-                cell.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
-                if (row == 0 && col == 0) {
-                    cell.getGState().setStrokeColor(new ColorPt(0, 0, 1));
-                    cell.setPathFill(true);
-                    cell.getGState().setFillOpacity(0.8);
-                    cell.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
-                    cell.getGState().setFillColor(new ColorPt(0, 0, 1));
-                } else {
-                    cell.setPathFill(false);
-                    cell.getGState().setStrokeColor(new ColorPt(0.1, 0.1, 0.1));
-                }
-                writer.writePlacedElement(cell);
-            }
-        }
-    }
-
-
-    @SneakyThrows
-    public static void drawRectCollection(ElementWriter writer, RectCollection rectCollection, Page page) {
-
-        ColorPt colorPt = new ColorPt(1, 0, 0);
-        ElementBuilder eb = new ElementBuilder();
-        for (int i = 0; i < rectCollection.getNumRects(); ++i) {
-            Rect r = rectCollection.getRectAt(i);
-            Element rect = eb.createRect(r.getX1(), r.getY1(), r.getWidth(), r.getHeight());
-
-            rect.setPathStroke(true);
-            rect.getGState().setLineWidth(5);
-            rect.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
-            rect.getGState().setStrokeColor(colorPt);
-
-            rect.setPathFill(true);
-            rect.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
-            rect.getGState().setFillColor(colorPt);
-            rect.getGState().setFillOpacity(0.5);
-
-            writer.writePlacedElement(rect);
-        }
-    }
-
 }

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/service/InvisibleElementRemovalServiceTest.java

@@ -1,41 +1,25 @@
 package com.iqser.red.service.ocr.v1.server.service;
 
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfTextExtraction.extractAllTextFromDocument;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import com.iqser.red.service.ocr.v1.server.Application;
-import com.iqser.red.service.ocr.v1.server.OcrServiceIntegrationTest;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.PageIterator;
-import com.pdftron.pdf.TextExtractor;
+import com.iqser.red.service.ocr.v1.server.AbstractTest;
 
 import lombok.SneakyThrows;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Import(OcrServiceIntegrationTest.TestConfiguration.class)
-public class InvisibleElementRemovalServiceTest {
+public class InvisibleElementRemovalServiceTest extends AbstractTest {
 
     @Autowired
     private InvisibleElementRemovalService invisibleElementRemovalService;
 
-    @MockBean
-    protected RabbitTemplate rabbitTemplate;
-
 
     @Test
     @SneakyThrows
@@ -46,27 +30,18 @@ public class InvisibleElementRemovalServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
 
         try (var initialFileStream = pdfFileResource.getInputStream(); var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
-            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out,false);
+            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out, false);
         }
 
         try (var initialFileStream = pdfFileResource.getInputStream(); var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + "_delta.pdf")) {
-            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out,true);
+            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out, true);
         }
 
         System.out.println("Output File without invisible elements: files/" + fileName + ".pdf");
         System.out.println("Output Delta File without invisible elements: files/" + fileName + "_delta.pdf");
-        TextExtractor extractor = new TextExtractor();
 
-        PDFDoc pdfDoc;
-        try(var fileStream = new FileInputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
-            pdfDoc = new PDFDoc(fileStream);
-        }
-
-        PageIterator iterator = pdfDoc.getPageIterator();
-        while (iterator.hasNext()) {
-            Page page = iterator.next();
-            extractor.begin(page);
-            String[] text = extractor.getAsText().split("\n");
+        try (var fileStream = new FileInputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
+            String[] text = extractAllTextFromDocument(fileStream).split("\n");
             assertThat(text).contains("APPENDIX 16 Pathology Report", "Amendment 1", "Page 255 of 260");
         }
     }

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/PdfDraw.java

@@ -0,0 +1,74 @@
+package com.iqser.red.service.ocr.v1.server.utils;
+
+import com.pdftron.pdf.ColorPt;
+import com.pdftron.pdf.ColorSpace;
+import com.pdftron.pdf.Element;
+import com.pdftron.pdf.ElementBuilder;
+import com.pdftron.pdf.ElementWriter;
+import com.pdftron.pdf.Page;
+import com.pdftron.pdf.Rect;
+import com.pdftron.pdf.RectCollection;
+
+import lombok.SneakyThrows;
+
+
+public class PdfDraw {
+
+    @SneakyThrows
+    public static void drawGrid(ElementWriter writer, Page page) {
+
+        ElementBuilder eb = new ElementBuilder();
+        double dX = 15;
+        double dY = 15;
+        int nRows = (int) (page.getPageHeight() / dY) + 1;
+        int nCols = (int) (page.getPageWidth() / dX) + 1;
+        for (int row = 0; row < nRows; ++row) {
+            for (int col = 0; col < nCols; ++col) {
+                Element cell = eb.createRect(col * dX, row * dY, dX, dY);
+                cell.setPathStroke(true);
+                cell.getGState().setLineWidth(1);
+                cell.getGState().setStrokeOpacity(0.1);
+                cell.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
+                if (row == 0 && col == 0) {
+                    cell.getGState().setStrokeColor(new ColorPt(0, 0, 1));
+                    cell.setPathFill(true);
+                    cell.getGState().setFillOpacity(0.8);
+                    cell.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
+                    cell.getGState().setFillColor(new ColorPt(0, 0, 1));
+                } else {
+                    cell.setPathFill(false);
+                    cell.getGState().setStrokeColor(new ColorPt(0.1, 0.1, 0.1));
+                }
+                writer.writePlacedElement(cell);
+            }
+        }
+        eb.destroy();
+    }
+
+
+    @SneakyThrows
+    public static void drawRectCollection(ElementWriter writer, RectCollection rectCollection) {
+
+        ColorPt colorPt = new ColorPt(1, 0, 0);
+        ElementBuilder eb = new ElementBuilder();
+        for (int i = 0; i < rectCollection.getNumRects(); ++i) {
+            Rect r = rectCollection.getRectAt(i);
+            Element rect = eb.createRect(r.getX1(), r.getY1(), r.getWidth(), r.getHeight());
+
+            rect.setPathStroke(true);
+            rect.getGState().setLineWidth(5);
+            rect.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
+            rect.getGState().setStrokeColor(colorPt);
+
+            rect.setPathFill(true);
+            rect.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
+            rect.getGState().setFillColor(colorPt);
+            rect.getGState().setFillOpacity(0.5);
+
+            writer.writePlacedElement(rect);
+        }
+        colorPt.destroy();
+        eb.destroy();
+    }
+
+}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/PdfTextExtraction.java

@@ -0,0 +1,35 @@
+package com.iqser.red.service.ocr.v1.server.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.pdftron.common.PDFNetException;
+import com.pdftron.pdf.PDFDoc;
+import com.pdftron.pdf.Page;
+import com.pdftron.pdf.PageIterator;
+import com.pdftron.pdf.TextExtractor;
+
+
+public class PdfTextExtraction {
+
+    public static String extractAllTextFromDocument(InputStream fileStream) throws IOException, PDFNetException {
+
+        PDFDoc pdfDoc = new PDFDoc(fileStream);
+        TextExtractor extractor = new TextExtractor();
+        List<String> texts = new ArrayList<>();
+
+        PageIterator iterator = pdfDoc.getPageIterator();
+        while (iterator.hasNext()) {
+            Page page = iterator.next();
+            extractor.begin(page);
+            texts.add(extractor.getAsText());
+        }
+
+        extractor.destroy();
+        pdfDoc.close();
+        return String.join("\n", texts);
+    }
+
+}