hotfix: test to add fonts

2023-08-10 10:55:25 +02:00
44 changed files with 157 additions and 920 deletions
@@ -38,7 +38,3 @@ build/

 ### VS Code ###
 .vscode/
-gradlew.bat
-gradlew
-gradle.properties
-gradle/
@@ -17,7 +17,6 @@
        <exclude name="AvoidDuplicateLiterals"/>
        <exclude name="AvoidFieldNameMatchingMethodName"/>
        <exclude name="AvoidFieldNameMatchingTypeName"/>
-        <exclude name="TestClassWithoutTestCases"/>
    </rule>

 </ruleset>
@@ -1,6 +1,6 @@
 plugins {
    id("com.knecon.fforesight.java-conventions")
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.1.0"
 }

 description = "layoutparser-service-internal-api"
@@ -19,7 +19,6 @@ public record LayoutParsingRequest(
        @NonNull String positionBlockFileStorageId,
        @NonNull String pageFileStorageId,
        @NonNull String simplifiedTextStorageId,
-        @NonNull String viewerDocumentStorageId,
        @NonNull String sectionGridStorageId) {

 }
@@ -1,6 +1,6 @@
 plugins {
    id("com.knecon.fforesight.java-conventions")
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.1.0"
 }

 description = "layoutparser-service-processor"
@@ -11,16 +11,16 @@ val pdfBoxVersion = "3.0.0-RC1"
 dependencies {
    implementation(project(":layoutparser-service-internal-api"))

-    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.138.0") {
+    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.124.0") {
        exclude("org.springframework.boot", "spring-boot-starter-security")
        exclude("org.springframework.boot", "spring-boot-starter-validation")
    }
    implementation("com.knecon.fforesight:tenant-commons:0.10.0")
-    implementation("com.iqser.red.commons:storage-commons:2.36.0")
+    implementation("com.iqser.red.commons:storage-commons:2.29.0")

    implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
    implementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
    implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
-    implementation("org.springframework.boot:spring-boot-starter-web:3.1.2")
+    implementation("org.springframework.boot:spring-boot-starter-web:3.0.6")
 }
@@ -2,19 +2,14 @@ package com.knecon.fforesight.service.layoutparser.processor;

 import static java.lang.String.format;

-import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
 import org.springframework.stereotype.Service;

 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent;
@@ -49,7 +44,6 @@ import com.knecon.fforesight.service.layoutparser.processor.services.factory.Doc
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.TaasDocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDFLinesTextStripper;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService;

 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -75,8 +69,6 @@ public class LayoutParsingPipeline {
    private final TaasBlockificationService taasBlockificationService;
    private final DocuMineBlockificationService docuMineBlockificationService;
    private final RedactManagerBlockificationService redactManagerBlockificationService;
-    private final ViewerDocumentService viewerDocumentService;
-

    public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {

@@ -101,12 +93,6 @@ public class LayoutParsingPipeline {
            layoutParsingStorageService.storeSectionGrid(layoutParsingRequest, sectionGridCreatorService.createSectionGrid(documentGraph));
            layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
            layoutParsingStorageService.storeSimplifiedText(layoutParsingRequest, simplifiedSectionTextService.toSimplifiedText(documentGraph));
-
-            try (var out = new ByteArrayOutputStream()) {
-                viewerDocumentService.createViewerDocument(originDocument, documentGraph, out);
-                layoutParsingStorageService.storeViewerDocument(layoutParsingRequest, out);
-            }
-
            if (layoutParsingRequest.layoutParsingType().equals(LayoutParsingType.TAAS)) {
                var researchDocumentData = TaasDocumentDataMapper.fromDocument(documentGraph);
                layoutParsingStorageService.storeResearchDocumentData(layoutParsingRequest, researchDocumentData);
@@ -128,9 +114,9 @@ public class LayoutParsingPipeline {

    @SneakyThrows
    public ClassificationDocument parseLayout(LayoutParsingType layoutParsingType,
-                                              PDDocument originDocument,
-                                              ImageServiceResponse imageServiceResponse,
-                                              TableServiceResponse tableServiceResponse) {
+                                PDDocument originDocument,
+                                ImageServiceResponse imageServiceResponse,
+                                TableServiceResponse tableServiceResponse) {

        Map<Integer, List<TableCells>> pdfTableCells = cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse);
        Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse);
@@ -166,12 +152,9 @@ public class LayoutParsingPipeline {
                    stripper.getMaxCharHeight());

            ClassificationPage classificationPage = switch (layoutParsingType) {
-                case REDACT_MANAGER ->
-                        redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-                case TAAS ->
-                        taasBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-                case DOCUMINE ->
-                        docuMineBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+                case REDACT_MANAGER -> redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+                case TAAS -> taasBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+                case DOCUMINE -> docuMineBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
            };
            classificationPage.setCleanRulings(cleanRulings);
            classificationPage.setRotation(rotation);
@@ -180,9 +163,6 @@ public class LayoutParsingPipeline {
            classificationPage.setPageWidth(cropbox.getWidth());
            classificationPage.setPageHeight(cropbox.getHeight());

-            // MarkedContent needs to be converted at this point, otherwise it leads to GC Problems in Pdfbox.
-            classificationPage.setMarkedContentBboxPerType(convertMarkedContents(stripper.getMarkedContents()));
-
            // If images is ocr needs to be calculated before textBlocks are moved into tables, otherwise findOcr algorithm needs to be adopted.
            if (pdfImages != null && pdfImages.containsKey(pageNumber)) {
                classificationPage.setImages(pdfImages.get(pageNumber));
@@ -196,6 +176,7 @@ public class LayoutParsingPipeline {
            classificationPages.add(classificationPage);
        }

+
        bodyTextFrameService.setBodyTextFrames(classificationDocument, layoutParsingType);

        switch (layoutParsingType) {
@@ -210,14 +191,6 @@ public class LayoutParsingPipeline {
        return classificationDocument;
    }

-
-    private Map<String, Rectangle2D> convertMarkedContents(List<PDMarkedContent> pdMarkedContents) {
-        Map<String, Rectangle2D> markedContentBboxes = new HashMap<>();
-        markedContentBboxes.put(MarkedContentUtils.HEADER, MarkedContentUtils.getMarkedContentBboxPerLine(pdMarkedContents, MarkedContentUtils.HEADER));
-        markedContentBboxes.put(MarkedContentUtils.FOOTER, MarkedContentUtils.getMarkedContentBboxPerLine(pdMarkedContents, MarkedContentUtils.FOOTER));
-        return markedContentBboxes;
-    }
-
    private void increaseDocumentStatistics(ClassificationPage classificationPage, ClassificationDocument document) {

        if (!classificationPage.isLandscape()) {
@@ -248,4 +221,6 @@ public class LayoutParsingPipeline {

    }

+
+
 }
@@ -1,7 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.processor;

-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -127,7 +125,6 @@ public class LayoutParsingStorageService {
        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.simplifiedTextStorageId(), simplifiedText);
    }

-
    @SneakyThrows
    private InputStream getObject(String storageId) {

@@ -137,14 +134,4 @@ public class LayoutParsingStorageService {
        return Files.newInputStream(path, StandardOpenOption.DELETE_ON_CLOSE);
    }

-
-    @SneakyThrows
-    public void storeViewerDocument(LayoutParsingRequest layoutParsingRequest, ByteArrayOutputStream out) {
-
-        try (var in = new ByteArrayInputStream(out.toByteArray())) {
-
-            storageService.storeObject(TenantContext.getTenantId(), layoutParsingRequest.viewerDocumentStorageId(), in);
-        }
-    }
-
 }
@@ -1,10 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;

-import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
@@ -14,7 +11,6 @@ import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFre
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;

@Data
@RequiredArgsConstructor
@@ -42,6 +38,4 @@ public class ClassificationPage {

    CleanRulings cleanRulings;

-    private Map<String, Rectangle2D> markedContentBboxPerType = new HashMap<>();
-
 }
@@ -73,7 +73,6 @@ public class TextPageBlock extends AbstractPageBlock {

        return sequences.get(0).getPageWidth();
    }
-    

    public static TextPageBlock merge(List<TextPageBlock> textBlocksToMerge) {

@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.Color;
-import java.awt.geom.Line2D;
-
-public record ColoredLine(Line2D line, Color color) {
-
-}
@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-public record ColoredRectangle(Rectangle2D rectangle2D, Color color) {
-
-}
@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-
-public record FilledRectangle(Rectangle2D rectangle2D, Color color, float alpha) {
-
-}
@@ -1,27 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class LayoutGrid {
-
-    int numberOfPages;
-    List<VisualizationsOnPage> visualizationsPerPages;
-
-
-    public LayoutGrid(int numberOfPages) {
-
-        this.numberOfPages = numberOfPages;
-        this.visualizationsPerPages = new ArrayList<>(numberOfPages);
-        for (int i = 0; i < numberOfPages; i++) {
-            this.visualizationsPerPages.add(VisualizationsOnPage.builder().pageNumber(i).build());
-        }
-    }
-
-}
@@ -1,7 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.geom.Point2D;
-
-public record PlacedText(String text, Point2D lineStart) {
-
-}
@@ -1,26 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Builder
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class VisualizationsOnPage {
-
-    int pageNumber;
-    @Builder.Default
-    List<PlacedText> placedTexts = new LinkedList<>();
-    @Builder.Default
-    List<ColoredLine> coloredLines = new LinkedList<>();
-    @Builder.Default
-    List<ColoredRectangle> coloredRectangles = new LinkedList<>();
-    @Builder.Default
-    List<FilledRectangle> filledRectangles = new LinkedList<>();
-
-}
@@ -2,7 +2,6 @@ package com.knecon.fforesight.service.layoutparser.processor.services;

 import java.util.List;

-import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
 import org.springframework.stereotype.Service;

 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
@@ -21,6 +20,7 @@ import com.knecon.fforesight.service.layoutparser.processor.utils.PositionUtils;
 public class BodyTextFrameService {


+
    public void setBodyTextFrames(ClassificationDocument classificationDocument, LayoutParsingType layoutParsingType) {

        Rectangle bodyTextFrame = calculateBodyTextFrame(classificationDocument.getPages(), classificationDocument.getFontSizeCounter(), false, layoutParsingType);
@@ -157,11 +157,6 @@ public class BodyTextFrameService {
                        continue;
                    }

-                    if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.HEADER)
-                            || MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.FOOTER)) {
-                        continue;
-                    }
-
                    float approxLineCount = PositionUtils.getApproxLineCount(textBlock);
                    if (layoutParsingType.equals(LayoutParsingType.DOCUMINE) && approxLineCount < approximateHeaderLineCount && textBlock.getMaxY() >= page.getPageHeight() - (page.getPageHeight() / 10) || !layoutParsingType.equals(
                            LayoutParsingType.DOCUMINE) && approxLineCount < approximateHeaderLineCount) {
@@ -238,4 +233,4 @@ public class BodyTextFrameService {

    }

-}
+}
@@ -5,7 +5,6 @@ import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
 import org.springframework.stereotype.Service;

 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
@@ -63,16 +62,12 @@ public class DocuMineClassificationService {
            textBlock.setClassification(PageBlockType.OTHER);
            return;
        }
-        if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.HEADER)
-                || PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())
-        ) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification(PageBlockType.HEADER);

-        } else if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.FOOTER)
-                || PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())
-        ) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification(PageBlockType.FOOTER);
        } else if (page.getPageNumber() == 1 && (PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock,
                document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks()
@@ -112,4 +107,4 @@ public class DocuMineClassificationService {
        }
    }

-}
+}
@@ -3,7 +3,6 @@ package com.knecon.fforesight.service.layoutparser.processor.services.classifica
 import java.util.List;
 import java.util.regex.Pattern;

-import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
 import org.springframework.stereotype.Service;

 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
@@ -52,13 +51,11 @@ public class RedactManagerClassificationService {
            textBlock.setClassification(PageBlockType.OTHER);
            return;
        }
-        if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.HEADER)
-                || PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification(PageBlockType.HEADER);

-        } else if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.FOOTER)
-                || PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification(PageBlockType.FOOTER);
        } else if (page.getPageNumber() == 1 && (PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock,
@@ -3,7 +3,6 @@ package com.knecon.fforesight.service.layoutparser.processor.services.classifica
 import java.util.List;
 import java.util.regex.Pattern;

-import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
 import org.springframework.stereotype.Service;

 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
@@ -57,11 +56,9 @@ public class TaasClassificationService {
            textBlock.setClassification(PageBlockType.OTHER);
            return;
        }
-        if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.HEADER)
-                || PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation())) {
            textBlock.setClassification(PageBlockType.HEADER);
-        } else if (MarkedContentUtils.intersects(textBlock, page.getMarkedContentBboxPerType(), MarkedContentUtils.FOOTER)
-                || PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation())) {
            textBlock.setClassification(PageBlockType.FOOTER);
        } else if (page.getPageNumber() == 1 && (PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock,
                document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks()
@@ -1,18 +1,32 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.parsing;

-import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.color.CMMException;
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.markedcontent.BeginMarkedContentSequenceWithProperties;
-import org.apache.pdfbox.contentstream.operator.markedcontent.EndMarkedContentSequence;
-import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
+import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
+import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
+import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
+import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
@@ -21,11 +35,14 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
 import org.apache.pdfbox.text.TextPosition;

-import java.awt.color.CMMException;
-import java.awt.geom.Point2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;

@Getter
@Slf4j
@@ -41,7 +58,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    private int minCharHeight;
    private int maxCharHeight;

-
    private float path_x;
    private float path_y;

@@ -72,12 +88,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        this.addOperator(new SetNonStrokingColorN());
        this.addOperator(new SetFontAndSize());
        this.addOperator(new SetLineWidth());
-
-
-        addOperator(new BeginMarkedContentSequenceWithProperties());
-//        addOperator(new BeginMarkedContentSequence());
-        addOperator(new EndMarkedContentSequence());
-
    }


@@ -88,7 +98,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {

        //move
        switch (operation) {
-
            case OperatorName.MOVE_TO:
                if (arguments.size() == 2) {
                    Point2D.Float pos = transformPosition(floatValue(arguments.get(0)), floatValue(arguments.get(1)));
@@ -210,11 +219,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            // This is a quick and dirt hack
            // Happens for file 216.pdf
            log.debug(e.getMessage());
-            var result = true;
-            for (var component : color.getComponents()) {
-                result = result && component == 0;
-            }
-            return result;
+            return color.getComponents()[0] == 0 && color.getComponents()[1] == 0 && color.getComponents()[2] == 0 && color.getComponents()[1] == 1;
        }
    }

@@ -339,4 +344,3 @@ public class PDFLinesTextStripper extends PDFTextStripper {

 }

-
@@ -25,20 +25,27 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.text.Bidi;
 import java.text.Normalizer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.regex.Pattern;

-import lombok.Getter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
-import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
 import org.apache.pdfbox.text.TextPosition;
@@ -56,10 +63,6 @@ public class PDFTextStripper extends LegacyPDFStreamEngine {
    private static float defaultDropThreshold = 2.5f;
    private static final boolean useCustomQuickSort;

-    @Getter
-    protected final List<PDMarkedContent> markedContents = new ArrayList<>();
-    protected final Deque<PDMarkedContent> currentMarkedContents = new ArrayDeque<>();
-
    private static final Log LOG = LogFactory.getLog(PDFTextStripper.class);

    // enable the ability to set the default indent/drop thresholds
@@ -193,45 +196,6 @@ public class PDFTextStripper extends LegacyPDFStreamEngine {
    }


-
-    public void beginMarkedContentSequence(COSName tag, COSDictionary properties)
-    {
-        PDMarkedContent markedContent = PDMarkedContent.create(tag, properties);
-        if (this.currentMarkedContents.isEmpty())
-        {
-            this.markedContents.add(markedContent);
-        }
-        else
-        {
-            PDMarkedContent currentMarkedContent =
-                    this.currentMarkedContents.peek();
-            if (currentMarkedContent != null)
-            {
-                currentMarkedContent.addMarkedContent(markedContent);
-            }
-        }
-        this.currentMarkedContents.push(markedContent);
-    }
-
-    @Override
-    public void endMarkedContentSequence()
-    {
-        if (!this.currentMarkedContents.isEmpty())
-        {
-            this.currentMarkedContents.pop();
-        }
-    }
-
-
-    public void xobject(PDXObject xobject)
-    {
-        if (!this.currentMarkedContents.isEmpty())
-        {
-            this.currentMarkedContents.peek().addXObject(xobject);
-        }
-    }
-
-
    /**
     * This will return the text of a document. See writeText. <br>
     * NOTE: The document must not be encrypted when coming into this method.
@@ -913,12 +877,7 @@ public class PDFTextStripper extends LegacyPDFStreamEngine {
                    textList.add(text);
                }
            }
-            if (!this.currentMarkedContents.isEmpty())
-            {
-                this.currentMarkedContents.peek().addText(text);
-            }
        }
-
    }


@@ -2144,7 +2103,6 @@ public class PDFTextStripper extends LegacyPDFStreamEngine {
            this.isHangingIndent = true;
        }

-
    }

 }
@@ -1,282 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.services.visualization;
-
-import static com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService.LINE_WIDTH;
-
-import java.awt.Color;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.springframework.stereotype.Service;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredLine;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.LayoutGrid;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.PlacedText;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-
-@Service
-public class LayoutGridService {
-
-    private static final Color INNER_LINES_COLOR = new Color(255, 175, 175);
-    private static final Color PARAGRAPH_COLOR = new Color(70, 130, 180);
-    public static final Color TABLE_COLOR = new Color(102, 205, 170);
-    public static final Color SECTION_COLOR = new Color(50, 50, 50);
-    public static final Color HEADLINE_COLOR = new Color(162, 56, 56);
-    public static final Color HEADER_COLOR = new Color(171, 131, 6);
-    public static final Color IMAGE_COLOR = new Color(253, 63, 146);
-
-
-    public LayoutGrid createLayoutGrid(Document document) {
-
-        LayoutGrid layoutGrid = new LayoutGrid(document.getNumberOfPages());
-        document.streamAllSubNodes().forEach(semanticNode -> {
-            Color color = switch (semanticNode.getType()) {
-                case PARAGRAPH -> PARAGRAPH_COLOR;
-                case TABLE -> TABLE_COLOR;
-                case SECTION -> SECTION_COLOR;
-                case HEADLINE -> HEADLINE_COLOR;
-                case HEADER, FOOTER -> HEADER_COLOR;
-                case IMAGE -> IMAGE_COLOR;
-                default -> null;
-            };
-            if (isNotSectionOrTableCellOrDocument(semanticNode)) {
-                addAsRectangle(semanticNode, layoutGrid, color);
-            }
-            if (semanticNode.getType().equals(NodeType.SECTION)) {
-                addSection(semanticNode, layoutGrid, color);
-            }
-            if (semanticNode.getType().equals(NodeType.TABLE)) {
-                Table table = (Table) semanticNode;
-                addInnerTableLines(table, layoutGrid);
-            }
-        });
-
-        return layoutGrid;
-    }
-
-
-    private void addInnerTableLines(Table table, LayoutGrid layoutGrid) {
-
-        if (table.getNumberOfCols() < 1 || table.getNumberOfRows() < 1) {
-            return;
-        }
-        for (Page page : table.getPages()) {
-            Optional<Integer> optionalFirstRowOnPage = table.streamCol(0).filter(tableCell -> tableCell.isOnPage(page.getNumber())).map(TableCell::getRow).findFirst();
-            if (optionalFirstRowOnPage.isEmpty()) {
-                continue;
-            }
-            int firstRowOnPage = optionalFirstRowOnPage.get();
-            Stream<Double> xStream = switch (page.getRotation()) {
-                case 90 -> streamBBoxOfCellsOnPage(table.streamCol(0), page).map(RectangularShape::getMinX);
-                case 180 -> streamBBoxOfCellsOnPage(table.streamRow(firstRowOnPage), page).map(RectangularShape::getMaxX);
-                case 270 -> streamBBoxOfCellsOnPage(table.streamCol(0), page).map(RectangularShape::getMaxX);
-                default -> streamBBoxOfCellsOnPage(table.streamRow(firstRowOnPage), page).map(RectangularShape::getMinX);
-            };
-            List<Double> xs = xStream.collect(Collectors.toList());
-            xs.remove(0);
-            Stream<Double> yStream = switch (page.getRotation()) {
-                case 90 -> streamBBoxOfCellsOnPage(table.streamRow(firstRowOnPage), page).map(RectangularShape::getMinY);
-                case 180 -> streamBBoxOfCellsOnPage(table.streamCol(0), page).map(RectangularShape::getMinY);
-                case 270 -> streamBBoxOfCellsOnPage(table.streamRow(firstRowOnPage), page).map(RectangularShape::getMaxY);
-                default -> streamBBoxOfCellsOnPage(table.streamCol(0), page).map(RectangularShape::getMaxY);
-            };
-            List<Double> ys = yStream.collect(Collectors.toList());
-            ys.remove(0);
-
-            Rectangle2D tableBBox = table.getBBox().get(table.getFirstPage());
-            List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getColoredLines();
-            xs.forEach(x -> {
-                Line2D line = new Line2D.Double(new Point2D.Double(x, tableBBox.getMaxY()), new Point2D.Double(x, tableBBox.getMinY()));
-                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR));
-            });
-            ys.forEach(y -> {
-                Line2D line = new Line2D.Double(new Point2D.Double(tableBBox.getMinX(), y), new Point2D.Double(tableBBox.getMaxX(), y));
-                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR));
-            });
-        }
-    }
-
-
-    private static Stream<Rectangle2D> streamBBoxOfCellsOnPage(Stream<TableCell> table, Page page) {
-
-        return table.filter(tableCell -> tableCell.isOnPage(page.getNumber())).map(TableCell::getBBox).map(bBoxMap -> bBoxMap.get(page));
-    }
-
-
-    private void addSection(SemanticNode semanticNode, LayoutGrid layoutGrid, Color color) {
-
-        Map<Page, Rectangle2D> bBoxMap = semanticNode.getBBox();
-        List<SemanticNode> subSections = semanticNode.streamAllSubNodesOfType(NodeType.SECTION).toList();
-        Page firstPage = semanticNode.getFirstPage();
-        if (!subSections.isEmpty()) {
-            addPlacedText(firstPage, bBoxMap.get(firstPage), buildTreeIdString(semanticNode), layoutGrid);
-        } else {
-            bBoxMap.forEach(((page, textBBox) -> addPlacedText(page, textBBox, buildTreeIdString(semanticNode), layoutGrid)));
-        }
-        if (bBoxMap.values().size() == 1) {
-            Rectangle2D r = RectangleTransformations.pad(bBoxMap.get(firstPage), LINE_WIDTH, LINE_WIDTH);
-            List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(firstPage.getNumber() - 1).getColoredLines();
-            List<Line2D> lines = createLinesFromRectangle(r, firstPage.getRotation());
-            // add string to top line
-            var firstLine = lines.remove(0);
-            coloredLines.add(new ColoredLine(firstLine, color));
-            for (Line2D line : lines) {
-                coloredLines.add(new ColoredLine(line, color));
-            }
-            return;
-        }
-        List<Page> pagesInOrder = bBoxMap.keySet().stream().sorted(Comparator.comparingInt(Page::getNumber)).collect(Collectors.toList());
-        pagesInOrder.remove(0);
-        addLinesForFirstPageOfSection(semanticNode, color, firstPage, layoutGrid);
-        var lastPage = pagesInOrder.remove(pagesInOrder.size() - 1);
-        addLinesForLastPageOfSection(semanticNode, color, lastPage, layoutGrid);
-        for (Page middlePage : pagesInOrder) {
-            addLinesForMiddlePageOfSection(semanticNode, color, middlePage, layoutGrid);
-        }
-    }
-
-
-    private void addPlacedText(Page page, Rectangle2D textBBox, String s, LayoutGrid layoutGrid) {
-
-        Point2D.Float upperLeftCorner = switch (page.getRotation()) {
-            case 90 -> new Point2D.Float((float) (textBBox.getMinX()), (float) textBBox.getMinY());
-            case 180 -> new Point2D.Float((float) (textBBox.getMaxX()), (float) textBBox.getMinY());
-            case 270 -> new Point2D.Float((float) (textBBox.getMaxX()), (float) textBBox.getMaxY());
-            default -> new Point2D.Float((float) (textBBox.getMinX()), (float) textBBox.getMaxY());
-        };
-        var placedTexts = layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getPlacedTexts();
-        placedTexts.add(new PlacedText(s, upperLeftCorner));
-    }
-
-
-    private void addLinesForMiddlePageOfSection(SemanticNode semanticNode, Color color, Page middlePage, LayoutGrid layoutGrid) {
-
-        List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(middlePage.getNumber() - 1).getColoredLines();
-        Rectangle2D r = RectangleTransformations.pad(semanticNode.getBBox().get(middlePage), LINE_WIDTH, LINE_WIDTH);
-        var midPageLines = createLinesFromRectangle(r, middlePage.getRotation());
-        // remove top line
-        midPageLines.remove(0);
-        // remove top line
-        midPageLines.remove(1);
-        // add string to left line
-        var leftLine = midPageLines.remove(1);
-        coloredLines.add(new ColoredLine(leftLine, color));
-        for (Line2D line : midPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
-        }
-    }
-
-
-    private void addLinesForLastPageOfSection(SemanticNode semanticNode, Color color, Page lastPage, LayoutGrid layoutGrid) {
-
-        List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(lastPage.getNumber() - 1).getColoredLines();
-        Rectangle2D r = RectangleTransformations.pad(semanticNode.getBBox().get(lastPage), LINE_WIDTH, LINE_WIDTH);
-        var lastPageLines = createLinesFromRectangle(r, lastPage.getRotation());
-        // remove top line
-        lastPageLines.remove(0);
-        // add string to left line
-        var leftLine = lastPageLines.remove(2);
-        coloredLines.add(new ColoredLine(leftLine, color));
-        for (Line2D line : lastPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
-        }
-    }
-
-
-    private void addLinesForFirstPageOfSection(SemanticNode semanticNode, Color color, Page firstPage, LayoutGrid layoutGrid) {
-
-        List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(firstPage.getNumber() - 1).getColoredLines();
-        Rectangle2D r = RectangleTransformations.pad(semanticNode.getBBox().get(firstPage), LINE_WIDTH, LINE_WIDTH);
-        var firstPageLines = createLinesFromRectangle(r, firstPage.getRotation());
-        // remove bottom line
-        firstPageLines.remove(2);
-        // add string to top line
-        var firstLine = firstPageLines.remove(0);
-        coloredLines.add(new ColoredLine(firstLine, color));
-        for (Line2D line : firstPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
-        }
-    }
-
-
-    private String buildTreeIdString(SemanticNode semanticNode) {
-
-        return semanticNode.getTreeId().stream().map(Object::toString).collect(Collectors.joining("."));
-    }
-
-
-    /*
-    A __________________ B
-     |                  |
-     |                  |
-     |                  |
-     |                  |
-    D|__________________| C
-    The returned List are the lines [AB, BC, DC, AD]
-    The List is reordered, such that the order of the returned lines are always as viewed on the page.
-     */
-    private List<Line2D> createLinesFromRectangle(Rectangle2D r, int pageRotation) {
-        // +0.5 to join the lines
-        List<Line2D> lines = new ArrayList<>(4);
-        float lineWidthCorrection = LINE_WIDTH * 0.5f;
-        Point2D.Float a = new Point2D.Float((float) r.getMinX(), (float) r.getMaxY());
-        Point2D.Float a1 = new Point2D.Float((float) r.getMinX() - lineWidthCorrection, (float) r.getMaxY());
-        Point2D.Float b = new Point2D.Float((float) r.getMaxX(), (float) r.getMaxY());
-        Point2D.Float b1 = new Point2D.Float((float) r.getMaxX() + lineWidthCorrection, (float) r.getMaxY());
-        Point2D.Float c = new Point2D.Float((float) r.getMaxX(), (float) r.getMinY());
-        Point2D.Float c1 = new Point2D.Float((float) r.getMaxX() + lineWidthCorrection, (float) r.getMinY());
-        Point2D.Float d = new Point2D.Float((float) r.getMinX(), (float) r.getMinY());
-        Point2D.Float d1 = new Point2D.Float((float) r.getMinX() - lineWidthCorrection, (float) r.getMinY());
-        lines.add(new Line2D.Float(a1, b1));
-        lines.add(new Line2D.Float(b, c));
-        lines.add(new Line2D.Float(d1, c1));
-        lines.add(new Line2D.Float(a, d));
-
-        return switch (pageRotation) {
-            case 90 -> {
-                Collections.rotate(lines, 1);
-                yield lines;
-            }
-            case 180 -> {
-                Collections.rotate(lines, 2);
-                yield lines;
-            }
-            case 270 -> {
-                Collections.rotate(lines, 3);
-                yield lines;
-            }
-
-            default -> lines;
-        };
-    }
-
-
-    private static boolean isNotSectionOrTableCellOrDocument(SemanticNode semanticNode) {
-
-        return !(semanticNode.getType().equals(NodeType.DOCUMENT) || semanticNode.getType().equals(NodeType.SECTION) || semanticNode.getType().equals(NodeType.TABLE_CELL));
-    }
-
-
-    private void addAsRectangle(SemanticNode semanticNode, LayoutGrid layoutGrid, Color color) {
-
-        semanticNode.getBBox()
-                .forEach((page, textBBox) -> layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getColoredRectangles().add(new ColoredRectangle(textBBox, color)));
-    }
-
-}
@@ -1,179 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.services.visualization;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
-import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
-import org.apache.pdfbox.util.Matrix;
-import org.springframework.stereotype.Service;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredLine;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.FilledRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.LayoutGrid;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.PlacedText;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.VisualizationsOnPage;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ViewerDocumentService {
-
-    private static final String layerName = "Layout grid";
-
-    private static final int FONT_SIZE = 10;
-    public static final float LINE_WIDTH = 1f;
-
-    private final LayoutGridService layoutGridService;
-
-
-    @SneakyThrows
-    public void createViewerDocument(PDDocument pdDocument, Document document, OutputStream outputStream) {
-
-        log.info("Start Viewer Document Creation");
-        LayoutGrid layoutGrid = layoutGridService.createLayoutGrid(document);
-        // PDDocument.save() is very slow, since it actually traverses the entire pdf and writes a new one.
-        // If we collect all COSDictionaries we changed and tell it explicitly to only add the changed ones by using saveIncremental it's very fast.
-        Set<COSDictionary> dictionariesToUpdate = new HashSet<>();
-        PDOptionalContentGroup layer = addLayerToDocument(pdDocument, dictionariesToUpdate);
-        PDFont font = PDType1Font.HELVETICA;
-
-        for (int pageNumber = 0; pageNumber < pdDocument.getNumberOfPages(); pageNumber++) {
-            PDPage pdPage = pdDocument.getPage(pageNumber);
-
-            AffineTransform textDeRotationMatrix = getTextDeRotationTransform(pdPage);
-            addLayerToPageRessources(pdPage);
-
-            // We need to save the graphics state before, such that our appended content cannot be affected by previous content streams with side effects,
-            // e.g. not escaped matrix transformations.
-            escapePreviousContents(pdDocument, pdPage);
-
-            VisualizationsOnPage visualizationsOnPage = layoutGrid.getVisualizationsPerPages().get(pageNumber);
-            assert pageNumber == visualizationsOnPage.getPageNumber();
-            // We need to append to the content stream, otherwise the content could be overlapped by following content.
-            try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, true)) {
-
-                contentStream.beginMarkedContent(COSName.OC, layer);
-                contentStream.saveGraphicsState();
-
-                contentStream.setLineWidth(LINE_WIDTH);
-                for (ColoredLine coloredLine : visualizationsOnPage.getColoredLines()) {
-                    contentStream.setStrokingColor(coloredLine.color());
-                    contentStream.moveTo((float) coloredLine.line().getX1(), (float) coloredLine.line().getY1());
-                    contentStream.lineTo((float) coloredLine.line().getX2(), (float) coloredLine.line().getY2());
-                    contentStream.stroke();
-                }
-                for (ColoredRectangle coloredRectangle : visualizationsOnPage.getColoredRectangles()) {
-                    contentStream.setStrokingColor(coloredRectangle.color());
-                    Rectangle2D r = coloredRectangle.rectangle2D();
-                    contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
-                    contentStream.stroke();
-                }
-                for (FilledRectangle filledRectangle : visualizationsOnPage.getFilledRectangles()) {
-                    contentStream.setNonStrokingColor(filledRectangle.color());
-                    PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
-                    graphicsState.setNonStrokingAlphaConstant(filledRectangle.alpha());
-                    contentStream.setGraphicsStateParameters(graphicsState);
-                    Rectangle2D r = filledRectangle.rectangle2D();
-                    contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
-                    contentStream.fill();
-                }
-                for (PlacedText placedText : visualizationsOnPage.getPlacedTexts()) {
-                    contentStream.setFont(font, FONT_SIZE);
-                    contentStream.beginText();
-                    Matrix textMatrix = new Matrix((float) textDeRotationMatrix.getScaleX(),
-                            (float) textDeRotationMatrix.getShearX(),
-                            (float) textDeRotationMatrix.getShearY(),
-                            (float) textDeRotationMatrix.getScaleY(),
-                            (float) placedText.lineStart().getX(),
-                            (float) placedText.lineStart().getY());
-                    textMatrix.translate(-((font.getStringWidth(placedText.text()) / 1000) * FONT_SIZE + (2 * LINE_WIDTH) + 4), -FONT_SIZE);
-                    contentStream.setTextMatrix(textMatrix);
-                    contentStream.showText(placedText.text());
-                    contentStream.endText();
-                }
-                contentStream.restoreGraphicsState();
-                contentStream.endMarkedContent();
-            }
-            dictionariesToUpdate.add(pdPage.getCOSObject());
-            dictionariesToUpdate.add(pdPage.getResources().getCOSObject());
-        }
-        dictionariesToUpdate.add(pdDocument.getDocumentInformation().getCOSObject());
-        pdDocument.saveIncremental(outputStream, dictionariesToUpdate);
-        log.info("Saved Viewer Document");
-    }
-
-
-    private static void addLayerToPageRessources(PDPage pdPage) {
-
-        PDResources resources = pdPage.getResources();
-        if (resources == null) {
-            resources = new PDResources();
-            pdPage.setResources(resources);
-        }
-    }
-
-
-    private static void escapePreviousContents(PDDocument pdDocument, PDPage pdPage) throws IOException {
-
-        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.PREPEND, false)) {
-            contentStream.saveGraphicsState();
-        }
-        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, false)) {
-            contentStream.restoreGraphicsState();
-        }
-    }
-
-
-    private static PDOptionalContentGroup addLayerToDocument(PDDocument pdDocument, Set<COSDictionary> dictionariesToUpdate) {
-
-        PDDocumentCatalog catalog = pdDocument.getDocumentCatalog();
-        PDOptionalContentProperties ocprops = catalog.getOCProperties();
-        if (ocprops == null) {
-            ocprops = new PDOptionalContentProperties();
-            catalog.setOCProperties(ocprops);
-        }
-        PDOptionalContentGroup layer = null;
-        if (ocprops.hasGroup(layerName)) {
-            layer = ocprops.getGroup(layerName);
-        } else {
-            layer = new PDOptionalContentGroup(layerName);
-            ocprops.addGroup(layer);
-        }
-        ocprops.setGroupEnabled(layer, false);
-        dictionariesToUpdate.add(catalog.getCOSObject());
-        return layer;
-    }
-
-
-    private static AffineTransform getTextDeRotationTransform(PDPage page) {
-
-        return AffineTransform.getQuadrantRotateInstance(switch (page.getRotation()) {
-            case 90 -> 3;
-            case 180 -> 2;
-            case 270 -> 1;
-            default -> 0;
-        });
-    }
-
-}
@@ -1,55 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
-import lombok.experimental.UtilityClass;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
-import org.apache.pdfbox.text.TextPosition;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@UtilityClass
-public class MarkedContentUtils {
-
-    public static final String HEADER = "Header";
-    public static final String FOOTER = "Footer";
-
-    public Rectangle2D getMarkedContentBboxPerLine(List<PDMarkedContent> markedContents, String subtype) {
-
-        if (markedContents == null) {
-            return null;
-        }
-
-        var markedContentByYPosition = markedContents.stream()
-                .filter(m -> m.getTag().equals("Artifact"))
-                .filter(m -> m.getProperties() != null)
-                .filter(m -> m.getProperties().getItem("Subtype") != null)
-                .filter(m -> ((COSName) m.getProperties().getItem("Subtype")).getName().equals(subtype))
-                .map(PDMarkedContent::getContents).flatMap(Collection::stream)
-                .filter(t -> t instanceof TextPosition)
-                .map(t -> (TextPosition) t)
-                .filter(t -> !t.getUnicode().equals(" "))
-                .collect(Collectors.groupingBy(TextPosition::getY));
-
-        if (markedContentByYPosition.isEmpty()) {
-            return null;
-        }
-
-        return RectangleTransformations.rectangle2DBBox(markedContentByYPosition.values().stream()
-                .map(textPositions -> new TextPositionSequence(textPositions.stream()
-                        .toList(), 0, true)
-                        .getRectangle())
-                .map(t -> new Rectangle2D.Float(t.getTopLeft().getX(), t.getTopLeft().getY() - Math.abs(t.getHeight()), t.getWidth(), Math.abs(t.getHeight()))).collect(Collectors.toList()));
-    }
-
-
-    public boolean intersects(TextPageBlock textBlock, Map<String, Rectangle2D> markedContentBboxPerType, String type) {
-        return markedContentBboxPerType.get(type) != null && markedContentBboxPerType.get(type).intersects(textBlock.getPdfMinX(), textBlock.getPdfMinY(), textBlock.getWidth(), textBlock.getHeight());
-    }
-
-}
@@ -4,54 +4,39 @@ plugins {
    application
    id("com.knecon.fforesight.java-conventions")
    id("org.springframework.boot") version "3.1.2"
-    id("io.spring.dependency-management") version "1.1.3"
+    id("io.spring.dependency-management") version "1.1.2"
    id("org.sonarqube") version "4.3.0.3225"
-    id("io.freefair.lombok") version "8.2.2"
-    id("org.graalvm.buildtools.native") version "0.9.24"
+    id("io.freefair.lombok") version "8.1.0"
+//    id("org.graalvm.buildtools.native") version "0.9.23"
 }

 description = "layoutparser-service-server"

 val jacksonVersion = "2.15.2"
-val pdfBoxVersion = "3.0.0-RC1"
-
-
+val pdfBoxVersion = "3.0.0-alpha2"

 dependencies {
    implementation(project(":layoutparser-service-processor"))
    implementation(project(":layoutparser-service-internal-api"))

-    implementation("com.iqser.red.commons:storage-commons:azNative2")
+    implementation("com.iqser.red.commons:storage-commons:2.29.0")
    implementation("com.knecon.fforesight:tenant-commons:0.10.0")
    implementation("org.springframework.boot:spring-boot-starter-actuator:3.1.2")
-    implementation("com.amazonaws:aws-java-sdk-s3:1.12.533")
-    implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.2")
+    implementation("com.amazonaws:aws-java-sdk-s3:1.12.526")
+    implementation("org.springframework.boot:spring-boot-starter-amqp:3.0.6")
    implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")

-
-//    implementation("com.azure:azure-storage-blob:12.24.0-beta.1")
-//    implementation("com.azure.spring:azure-spring-cloud-storage:2.14.0")
-
    // for integration testing only
    testImplementation(project(":layoutparser-service-internal-api"))

-
-    testImplementation("org.springframework.boot:spring-boot-starter-amqp:3.1.2")
-    testImplementation("com.iqser.red.service:persistence-service-shared-api-v1:2.138.0")
+    testImplementation("org.springframework.boot:spring-boot-starter-amqp:3.0.6")
+    testImplementation("com.iqser.red.service:persistence-service-shared-api-v1:2.124.0")
    testImplementation("com.iqser.red.commons:jackson-commons:1.3.0")
    testImplementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
    testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
    testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
-    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.2")
-}
-
-
-configurations {
-    all {
-        exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging")
-        exclude(group = "commons-logging", module = "commons-logging")
-    }
+    testImplementation("org.springframework.boot:spring-boot-starter-test:3.0.6")
 }

 /*
@@ -63,8 +48,6 @@ We traced the issue to storage-commons and there to azure blob storage, this is
 https://github.com/Azure/azure-sdk-for-java/issues/36001

 //AOT is springs ahead of time compilation, it is a code analysis which generates new code, therefore checkstyle and pmd can be disabled on them.
-*/
-
 tasks.named<Checkstyle>("checkstyleAot") {
    enabled = false
 }
@@ -77,7 +60,7 @@ tasks.named<Pmd>("pmdAot") {
 tasks.named<Pmd>("pmdAotTest") {
    enabled = false
 }
-
+*/

 sonarqube {
    properties {
@@ -88,10 +71,31 @@ sonarqube {

 tasks.named<BootBuildImage>("bootBuildImage") {

-    environment.put("BP_NATIVE_IMAGE_BUILD_ARGUMENTS", "-Djava.security.properties=/workspace/BOOT-INF/classes/custom.security --initialize-at-run-time=org.slf4j,org.apache.log4,org.apache.commons.logging --trace-class-initialization=org.apache.commons.logging.LogFactory")
+//    environment.put("BP_ACCEPT_EULA","Y")
+////    println("--------------------" + layout.projectDirectory.file( "src/main/resources/Aptfile").toString());
+//    var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${aptfilePath}:/workspace/Aptfile:ro")
+//    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae", "urn:cnb:builder:paketo-buildpacks/java"))
+
+
+//    environment.put("BP_LOG_LEVEL","DEBUG")
+//    var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${aptfilePath}:/workspace/Aptfile:ro")
+//    var shfilePath = layout.projectDirectory.file( "src/main/resources/buildpack-run.sh").toString() // make sure this path is valid because there will be no log or exception if not
+//    bindings.add("${shfilePath}:/workspace/buildpack-run.sh:ro")
+//    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_run@sha256:5c75bf651072e1ad345aa148433b8cdd373e97f9b29523ceaeaf1c39f1691985", "ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae","urn:cnb:builder:paketo-buildpacks/java"))
+
+    var fontsfilePath = layout.projectDirectory.file( "src/main/resources/fonts.tar.gz").toString() // make sure this path is valid because there will be no log or exception if not
+    bindings.add("${fontsfilePath}:/workspace/fonts.tar.gz:ro")
+
+    var shfilePath = layout.projectDirectory.file( "src/main/resources/buildpack-run.sh").toString() // make sure this path is valid because there will be no log or exception if not
+    bindings.add("${shfilePath}:/workspace/buildpack-run.sh:ro")
+    buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_run@sha256:5c75bf651072e1ad345aa148433b8cdd373e97f9b29523ceaeaf1c39f1691985", "urn:cnb:builder:paketo-buildpacks/java"))
+
+
+
+

-    environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
-    environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")

    imageName.set("nexus.knecon.com:5001/ff/${project.name}:${project.version}")
    if (project.hasProperty("buildbootDockerHostNetwork")) {
@@ -0,0 +1,14 @@
+# you can list packages
+ghostscript
+cabextract
+xfonts-utils
+fonts-liberation
+lmodern
+ttf-mscorefonts-installer
+
+
+# or include links to specific .deb files
+# http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb
+
+# or add custom apt repos (only required if using packages outside of the standard Ubuntu APT repositories)
+# :repo:deb http://cz.archive.ubuntu.com/ubuntu artful main universe
@@ -1,10 +0,0 @@
-[
-  {
-    "name": "org.apereo.cas.web.CasWebApplicationContext",
-    "allDeclaredConstructors": true
-  }
-]
-
-
-
-
@@ -0,0 +1 @@
+tar -xf fonts.tar.gz
@@ -1 +0,0 @@
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA, DSA
@@ -1,7 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.server;

-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
 import java.awt.Color;
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,7 +17,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.ResearchDocumentData;
@@ -50,27 +47,12 @@ public class BdrJsonBuildTest extends AbstractTest {

        try (InputStream inputStream = new FileInputStream(filename)) {
            try (PDDocument pdDocument = Loader.loadPDF(inputStream)) {
-                return DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.TAAS,
-                        pdDocument,
-                        new ImageServiceResponse(),
-                        new TableServiceResponse()));
+                return DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.TAAS, pdDocument, new ImageServiceResponse(), new TableServiceResponse()));
            }
        }
    }


-    @Test
-    @SneakyThrows
-    public void testBDRFile199865() {
-
-        File file = new ClassPathResource("files/bdr/Drucksache_19_9865.pdf").getFile();
-        Document document = buildGraph(file);
-        ResearchDocumentData researchDocumentData = TaasDocumentDataMapper.fromDocument(document);
-        assertThat(researchDocumentData).isNotNull();
-
-    }
-
-
    @Test
    @Disabled
    public void writeBDRDocumentData() throws IOException {
@@ -30,10 +30,10 @@ import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
 import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.tenantcommons.TenantsClient;

@@ -40,13 +40,6 @@ public class BuildDocumentGraphTest extends AbstractTest {
    @SneakyThrows
    protected Document buildGraph(String filename) {

-        return buildGraph(filename, LayoutParsingType.REDACT_MANAGER);
-    }
-
-
-    @SneakyThrows
-    protected Document buildGraph(String filename, LayoutParsingType layoutParsingType) {
-
        if (filename.equals("files/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf")) {
            prepareStorage(filename, "cv_table_parsing_response/empty.json", "image_service_response/S-Metolachlor_RAR_01_Volume_1_2018-09-06.IMAGE_INFO.json");
        } else {
@@ -55,7 +48,7 @@ public class BuildDocumentGraphTest extends AbstractTest {
        ClassPathResource fileResource = new ClassPathResource(filename);

        try (InputStream inputStream = fileResource.getInputStream(); PDDocument pdDocument = Loader.loadPDF(inputStream)) {
-            return DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(layoutParsingType,
+            return DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.DOCUMINE,
                    pdDocument,
                    layoutParsingStorageService.getImagesFile(IMAGE_FILE_ID),
                    new TableServiceResponse()));
@@ -15,9 +15,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;

@@ -16,17 +16,15 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.textbloc
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;

 import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;

-@Slf4j
 public class DocumentGraphVisualizationTest extends BuildDocumentGraphTest {

    @Test
    @SneakyThrows
-//    @Disabled
+    @Disabled
    public void visualizeMetolachlor() {

-        String filename = "files/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (4).pdf";
+        String filename = "files/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf";
        visualizePdf(filename);
    }

@@ -69,12 +67,9 @@ public class DocumentGraphVisualizationTest extends BuildDocumentGraphTest {
        try (var fileStream = fileResource.getInputStream();//
             PDDocument pdDocument = Loader.loadPDF(fileStream)//
        ) {
-            log.info("drawing document");
-            PdfDraw.drawDocumentGraph(pdDocument, documentGraph);
-            PdfDraw.drawTextBlock(pdDocument, textBlock, PdfDraw.Options.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
-            log.info("saving document");
-            pdDocument.save(tmpFile);
-            log.info("saved document");
+                PdfDraw.drawDocumentGraph(pdDocument, documentGraph);
+                PdfDraw.drawTextBlock(pdDocument, textBlock, PdfDraw.Options.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
+                pdDocument.save(tmpFile);
        }
    }

@@ -1,34 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.server.graph;
-
-import java.io.FileOutputStream;
-import java.nio.file.Path;
-
-import org.apache.pdfbox.Loader;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.ClassPathResource;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.LayoutGridService;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService;
-
-import lombok.SneakyThrows;
-
-public class ViewerDocumentTest extends BuildDocumentGraphTest {
-
-    @Test
-    @SneakyThrows
-    public void testViewerDocument() {
-
-        LayoutGridService layoutGridService = new LayoutGridService();
-        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(layoutGridService);
-        String fileName = "files/new/VV-511309_OCR.pdf";
-        Document document = buildGraph(fileName, LayoutParsingType.DOCUMINE);
-        String tmpFileName = "/tmp/" + Path.of(fileName).getFileName() + "_VIEWER.pdf";
-        try (var pdDocument = Loader.loadPDF(new ClassPathResource(fileName).getInputStream()); var out = new FileOutputStream(tmpFileName)) {
-            viewerDocumentService.createViewerDocument(pdDocument, document, out);
-        }
-    }
-
-}
@@ -1,5 +1,24 @@
 package com.knecon.fforesight.service.layoutparser.server.segmentation;

+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
 import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline;
@@ -15,19 +34,8 @@ import com.knecon.fforesight.service.layoutparser.processor.python_api.model.tab
 import com.knecon.fforesight.service.layoutparser.processor.services.SectionsBuilderService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.RedactManagerClassificationService;
 import com.knecon.fforesight.service.layoutparser.server.utils.AbstractTest;
+
 import lombok.SneakyThrows;
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;

 public class PdfSegmentationServiceTest extends AbstractTest {

@@ -52,7 +60,7 @@ public class PdfSegmentationServiceTest extends AbstractTest {

    public ClassificationDocument buildClassificationDocument(PDDocument originDocument) {

-        ClassificationDocument classificationDocument = layoutParsingPipeline.parseLayout(LayoutParsingType.DOCUMINE,
+        ClassificationDocument classificationDocument = layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                originDocument,
                new ImageServiceResponse(),
                new TableServiceResponse());
@@ -17,10 +17,11 @@ import lombok.SneakyThrows;
 class PageContentExtractorTest {

    @Test
+    @Disabled
    @SneakyThrows
    public void testTextPositionSequenceExtraction() {

-        String fileName = "files/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (4).pdf";
+        String fileName = "files/invisible_tables/test-two-pages_ocred.pdf";
        var tmpFileName = Path.of("/tmp/").resolve(Path.of(fileName).getFileName() + "_TEXT_POSITION_SEQUENCES.pdf").toString();

        List<PageContents> textPositionPerPage = PageContentExtractor.getSortedPageContents(fileName);
@@ -54,7 +54,6 @@ public abstract class AbstractTest {
    protected final static String PAGES_FILE_ID = "pages";
    protected final static String TENANT_ID = "tenant";
    protected final static String SECTION_GRID_ID = "section";
-    protected final static String VIEWER_DOCUMENT_ID = "viewer";
    protected final static String SIMPLIFIED_ID = "simplified";


@@ -71,7 +70,6 @@ public abstract class AbstractTest {
                .pageFileStorageId(PAGES_FILE_ID)
                .simplifiedTextStorageId(SIMPLIFIED_ID)
                .sectionGridStorageId(SECTION_GRID_ID)
-                .viewerDocumentStorageId(VIEWER_DOCUMENT_ID)
                .build();
    }

@@ -112,7 +110,6 @@ public abstract class AbstractTest {
                .pageFileStorageId(PAGES_FILE_ID)
                .simplifiedTextStorageId(SIMPLIFIED_ID)
                .sectionGridStorageId(SECTION_GRID_ID)
-                .viewerDocumentStorageId(VIEWER_DOCUMENT_ID)
                .build();
    }

@@ -146,7 +143,6 @@ public abstract class AbstractTest {
                .pageFileStorageId(PAGES_FILE_ID)
                .simplifiedTextStorageId(SIMPLIFIED_ID)
                .sectionGridStorageId(SECTION_GRID_ID)
-                .viewerDocumentStorageId(VIEWER_DOCUMENT_ID)
                .build();
    }

@@ -14,6 +14,7 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;

@@ -143,7 +144,7 @@ public class PdfDraw {
        } else {
            contentStream.newLineAtOffset((float) location.getX(), (float) location.getY());
        }
-        contentStream.setFont(PDType1Font.HELVETICA, 10);
+        contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 10);
        contentStream.showText(string);
        contentStream.endText();
        contentStream.close();
@@ -1,8 +0,0 @@
-#!/bin/bash
-dir=${PWD##*/}
-gradle assemble
-
-buildNumber=${1:-1}
-
-gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$USER-$buildNumber
-echo "nexus.knecon.com:5001/red/${dir}-server-v1:$USER-$buildNumber"
				`@@ -1 +0,0 @@`
				`jdk.jar.disabledAlgorithms=MD2, MD5, RSA, DSA`