Test old pattern

bamboo-specs/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>8.0.3</version>
+    <version>7.2.2</version>
     <relativePath/>
   </parent>
 

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -1,8 +1,5 @@
 package buildjob;
 
-import java.time.DayOfWeek;
-import java.time.LocalTime;
-
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
@@ -22,8 +19,6 @@ import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
 import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
-import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger;
-import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
 import com.atlassian.bamboo.specs.builders.task.ScriptTask;
@@ -55,11 +50,6 @@ public class PlanSpec {
         bambooServer.publish(plan);
         PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
         bambooServer.publish(planPermission);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        bambooServer.publish(secPlan);
-        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
-        bambooServer.publish(secPlanPermission);
     }
 
     private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
@@ -104,6 +94,11 @@ public class PlanSpec {
                                                 .description("Resultparser")
                                                 .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
                                                 .enabled(true),
+                                        new ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME),
                                         new InjectVariablesTask()
                                                 .description("Inject git Tag")
                                                 .path("git.tag")
@@ -130,45 +125,4 @@ public class PlanSpec {
                                 .whenInactiveInRepositoryAfterDays(14))
                         .notificationForCommitters());
     }
-
-    public Plan createSecBuild() {
-        return new Plan(
-                project(),
-                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
-                .description("Security Analysis Plan")
-                .stages(new Stage("Default Stage")
-                        .jobs(new Job("Default Job",
-                                new BambooKey("JOB1"))
-                                .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Sonar")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                                .argument(SERVICE_NAME))
-                                .dockerConfiguration(
-                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
-                                                .dockerRunArguments("--net=host")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(
-                        new ScheduledTrigger()
-                                .scheduleOnceDaily(LocalTime.of(12, 00)),
-                        new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranchMatching("release.*")
-                        .notificationForCommitters());
-    }
 }

bamboo-specs/src/main/resources/scripts/sonar-java.sh

@@ -3,12 +3,6 @@ set -e
 
 SERVICE_NAME=$1
 
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean install \
-    -Djava.security.egd=file:/dev/./urandomelse
-
 echo "dependency-check:aggregate"
 ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
     --no-transfer-progress \

bamboo-specs/src/test/java/buildjob/PlanSpecTest.java

@@ -11,9 +11,7 @@ public class PlanSpecTest {
     @Test
     public void checkYourPlanOffline() throws PropertiesValidationException {
         Plan plan = new PlanSpec().createPlan();
-        EntityPropertiesBuilders.build(plan);
 
-        Plan secPlan = new PlanSpec().createSecBuild();
-        EntityPropertiesBuilders.build(secPlan);
+        EntityPropertiesBuilders.build(plan);
     }
 }

redaction-service-image-v1/pom.xml

@@ -6,7 +6,6 @@
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-docker-dependency</artifactId>
         <version>1.1.0</version>
-        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

redaction-service-v1/pom.xml

@@ -5,8 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.5.0</version>
-        <relativePath />
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +13,7 @@
     <groupId>com.iqser.red.service</groupId>
     <version>1.0-SNAPSHOT</version>
 
+
     <packaging>pom</packaging>
 
     <modules>

redaction-service-v1/redaction-service-api-v1/pom.xml

@@ -11,10 +11,6 @@
 
     <artifactId>redaction-service-api-v1</artifactId>
 
-    <properties>
-        <persistence-service.version>0.151.0</persistence-service.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -24,7 +20,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>persistence-service-api-v1</artifactId>
-            <version>${persistence-service.version}</version>
+            <version>0.44.0</version>
         </dependency>
     </dependencies>
 </project>

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeRequest.java

@@ -19,11 +19,10 @@ import java.util.Set;
 @AllArgsConstructor
 public class AnalyzeRequest {
 
-    private MessageType messageType;
-
     private String dossierId;
     private String fileId;
     private String dossierTemplateId;
+    private boolean reanalyseOnlyIfPossible;
     private ManualRedactions manualRedactions;
     private OffsetDateTime lastProcessed;
 

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java

@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AnalyzeResult {
 
-    private MessageType messageType;
-
     private String dossierId;
     private String fileId;
     private long duration;
@@ -29,8 +25,6 @@ public class AnalyzeResult {
 
     private int analysisVersion;
 
-    private ManualRedactions manualRedactions;
-
 
 }
 

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnnotateRequest.java

@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,5 +14,4 @@ public class AnnotateRequest {
     private String dossierId;
     private String dossierTemplateId;
     private String fileId;
-    private ManualRedactions manualRedactions;
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionType.java

@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE, RESIZE
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/MessageType.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum MessageType {
-
-    FULL_ANALYSE, REANALYSE, SURROUNDING_TEXT
-
-}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java

@@ -26,18 +26,10 @@ public class RedactionLogEntry {
     private String value;
     private String reason;
     private int matchedRule;
-    private boolean rectangle;
     private String legalBasis;
     private boolean redacted;
     private boolean isHint;
     private boolean isRecommendation;
-
-    private boolean hasBeenResized;
-    private boolean hasBeenRecategorized;
-    private boolean hasLegalBasisChanged;
-    private boolean hasBeenForced;
-    private boolean hasBeenRemovedByManualOverride;
-
     private String section;
     private float[] color;
 

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/SectionArea.java

@@ -30,9 +30,4 @@ public class SectionArea {
         return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
     }
 
-    // TODO we should only use one rectangle class.
-    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
-    }
-
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/SectionGrid.java

@@ -3,9 +3,10 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Data
 @AllArgsConstructor
@@ -14,16 +15,4 @@ public class SectionGrid {
 
     private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
 
-    private List<SectionGridSection> sections = new ArrayList<>();
-
-    @Data
-    @RequiredArgsConstructor
-    public static class SectionGridSection {
-
-        private final int sectionNumber;
-        private final String headline;
-        private final Set<Integer> pages;
-        private final List<SectionArea> sectionAreas;
-
-    }
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -1,43 +1,29 @@
 package com.iqser.red.service.redaction.v1.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.*;
-
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 public interface RedactionResource {
 
     @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
 
-
     @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult sections(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
     void testRules(@RequestBody String rules);
 
-
     @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
 
-
-    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
-                                        @PathVariable("fileId") String fileId,
-                                        @RequestBody ManualRedactions manualRedactions);
-
 }

redaction-service-v1/redaction-service-server-v1/pom.xml

@@ -11,14 +11,6 @@
 
     <artifactId>redaction-service-server-v1</artifactId>
 
-    <properties>
-        <drools.version>7.59.0.Final</drools.version>
-        <kie.version>7.59.0.Final</kie.version>
-        <locationtech.version>1.16.1</locationtech.version>
-        <pdfbox.jbig2-imageio.version>3.0.3</pdfbox.jbig2-imageio.version>
-        <jai-imageio.version>1.4.0</jai-imageio.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
@@ -32,17 +24,17 @@
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
-            <version>${drools.version}</version>
+            <version>7.59.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>${kie.version}</version>
+            <version>7.59.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
-            <version>${locationtech.version}</version>
+            <version>1.16.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -52,17 +44,17 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>jbig2-imageio</artifactId>
-            <version>${pdfbox.jbig2-imageio.version}</version>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
-            <version>${jai-imageio.version}</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>${jai-imageio.version}</version>
+            <version>1.4.0</version>
         </dependency>
 
         <!-- commons -->

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Page.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -17,7 +16,7 @@ public class Page {
     @NonNull
     private List<AbstractTextContainer> textBlocks;
 
-    private List<PdfImage> images = new ArrayList<>();
+    private List<PdfImage> images;
 
     private Rectangle bodyTextFrame;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java

@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;
 
-import static java.util.stream.Collectors.toSet;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -18,7 +16,6 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -28,12 +25,9 @@ public class BlockificationService {
 
     static final float THRESHOLD = 1f;
 
-
     public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
                          List<Ruling> verticalRulingLines) {
 
-        sortRotatedSequences(textPositions);
-
         List<TextPositionSequence> chunkWords = new ArrayList<>();
         List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
 
@@ -56,7 +50,7 @@ public class BlockificationService {
             if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
 
                 Orientation prevOrientation = null;
-                if (!chunkBlockList1.isEmpty()) {
+                if(!chunkBlockList1.isEmpty()) {
                     prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
                 }
 
@@ -68,11 +62,15 @@ public class BlockificationService {
                     wasSplitted = true;
                     cb1.setOrientation(Orientation.LEFT);
                     splitX1 = word.getX1();
-                } else if (newLineAfterSplit && !splittedByRuling) {
+                } else
+
+                if (newLineAfterSplit && !splittedByRuling) {
                     wasSplitted = false;
                     cb1.setOrientation(Orientation.RIGHT);
                     splitX1 = null;
-                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)) {
+                } else
+
+                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
                     cb1.setOrientation(Orientation.LEFT);
                 }
 
@@ -112,18 +110,16 @@ public class BlockificationService {
         while (itty.hasNext()) {
             TextBlock block = (TextBlock) itty.next();
 
-            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
-                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft
-                        .getMinY()) {
+            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
                     previousLeft.add(block);
                     itty.remove();
                     continue;
                 }
             }
 
-            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
-                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight
-                        .getMinY()) {
+            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
                     previousRight.add(block);
                     itty.remove();
                     continue;
@@ -137,16 +133,16 @@ public class BlockificationService {
             }
         }
 
+
         itty = chunkBlockList1.iterator();
         TextBlock previous = null;
         while (itty.hasNext()) {
             TextBlock block = (TextBlock) itty.next();
 
-            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
-                    .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous
-                    .getOrientation()
-                    .equals(Orientation.LEFT) && block.getOrientation()
-                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
+            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())||
+                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())){
                 previous.add(block);
                 itty.remove();
                 continue;
@@ -155,12 +151,11 @@ public class BlockificationService {
             previous = block;
         }
 
+
         return new Page(chunkBlockList1);
     }
 
-
-    private boolean equalsWithThreshold(float f1, float f2) {
-
+    private boolean equalsWithThreshold(float f1, float f2){
         return Math.abs(f1 - f2) < THRESHOLD;
     }
 
@@ -202,13 +197,6 @@ public class BlockificationService {
             textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
         }
 
-        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences()
-                .stream()
-                .map(t -> round(t.getY1(), 3))
-                .collect(toSet())
-                .size() == 1) {
-            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1));
-        }
         return textBlock;
     }
 
@@ -303,30 +291,4 @@ public class BlockificationService {
         return new Rectangle(minY, minX, maxX - minX, maxY - minY);
     }
 
-
-    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
-
-        List<TextPositionSequence> rotatedWords = new ArrayList<>();
-        Iterator<TextPositionSequence> itty = sequences.iterator();
-        while (itty.hasNext()) {
-            var pos = itty.next();
-            if (pos.getTextPositions().get(0).getDir() == 270) {
-                rotatedWords.add(pos);
-                itty.remove();
-            }
-        }
-
-        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
-            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
-        }
-        sequences.addAll(rotatedWords);
-    }
-
-
-    private double round(float value, int decimalPoints) {
-
-        var d = Math.pow(10, decimalPoints);
-        return Math.round(value * d) / d;
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/ClassificationService.java

@@ -73,10 +73,8 @@ public class ClassificationService {
             }
         } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
                 .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle()
-                .equals("bold") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
-                .getFontSizeCounter()
-                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {
 
             for (int i = 1; i <= headlineFontSizes.size(); i++) {
                 if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -88,7 +86,7 @@ public class ClassificationService {
                 .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
                 .equals("bold") && !document.getFontStyleCounter()
                 .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
             textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
             document.setHeadlines(true);
         } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/ImageClassificationClient.java

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
+public interface ImageClassificationClient {
+
+    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ImageClassificationResponse classify(@RequestBody MultipartFile file);
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/ImageClassificationResponse.java

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageClassificationResponse {
+
+    private String category;
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/ControllerAdvice.java

@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
 import com.iqser.red.commons.spring.ErrorMessage;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -37,11 +36,4 @@ public class ControllerAdvice {
         return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
     }
 
-    @ResponseBody
-    @ResponseStatus(value = HttpStatus.NOT_FOUND)
-    @ExceptionHandler(value = NotFoundException.class)
-    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
-        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java

@@ -1,42 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.amazonaws.services.kms.model.NotFoundException;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 @Slf4j
 @RestController
@@ -50,26 +38,18 @@ public class RedactionController implements RedactionResource {
     private final PdfSegmentationService pdfSegmentationService;
     private final RedactionStorageService redactionStorageService;
     private final RedactionLogMergeService redactionLogMergeService;
-    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
-
 
     public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest
-                .getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder()
-                .fileId(annotateRequest.getFileId())
-                .manualRedactions(annotateRequest.getManualRedactions())
-                .dossierId(annotateRequest.getDossierId())
-                .dossierTemplateId(annotateRequest.getDossierTemplateId())
-                .build());
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
         var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
 
         try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
             pdDocument.setAllSecurityToBeRemoved(true);
 
             dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
-            annotationService.annotate(pdDocument, mergedRedactionLog, sectionsGrid);
+            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
 
             try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                 pdDocument.save(byteArrayOutputStream);
@@ -84,14 +64,11 @@ public class RedactionController implements RedactionResource {
 
     @Override
     public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
-
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
         try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                 pdDocument.setAllSecurityToBeRemoved(true);
 
@@ -107,19 +84,16 @@ public class RedactionController implements RedactionResource {
             throw new RedactionException(e);
         }
 
-    }
 
+    }
 
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
         try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                 pdDocument.setAllSecurityToBeRemoved(true);
 
@@ -134,6 +108,7 @@ public class RedactionController implements RedactionResource {
             throw new RedactionException(e);
         }
 
+
     }
 
 
@@ -143,13 +118,13 @@ public class RedactionController implements RedactionResource {
         Document classifiedDoc;
 
         try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
         } catch (Exception e) {
             throw new RedactionException(e);
         }
 
+
         StringBuilder sb = new StringBuilder();
         for (Page page : classifiedDoc.getPages()) {
             for (AbstractTextContainer textContainer : page.getTextBlocks()) {
@@ -164,14 +139,12 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public void testRules(@RequestBody String rules) {
 
         droolsExecutionService.testRules(rules);
     }
 
-
     @Override
     public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
 
@@ -184,38 +157,15 @@ public class RedactionController implements RedactionResource {
             throw new NotFoundException("RedactionLog not present");
         }
 
-        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-
-        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest
-                .getFileId());
-        if (sectionGrid.getSections().isEmpty()) {
-
-            log.info("SectionGrid does not have headlines set. Computing headlines now!");
-            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-            // enhance section grid with headline data
-            for (var sectionText : text.getSectionTexts()) {
-                sectionGrid.getSections()
-                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText
-                                .getSectionAreas()
-                                .stream()
-                                .map(SectionArea::getPage)
-                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
-            }
-            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
-        }
-
         log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
         if (redactionLog.getAnalysisVersion() == 0) {
             // old redaction logs are returned directly
             return redactionLog;
         } else {
-            return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest
-                    .getManualRedactions(), redactionRequest.getExcludedPages());
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
         }
     }
 
-
     private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
@@ -229,16 +179,4 @@ public class RedactionController implements RedactionResource {
     }
 
 
-    @Override
-    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
-                                               @PathVariable("fileId") String fileId,
-                                               @RequestBody ManualRedactions manualRedactions) {
-
-        long start = System.currentTimeMillis();
-        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
-        log.info("add surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, System
-                .currentTimeMillis() - start);
-        return result;
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/exception/NotFoundException.java

@@ -1,9 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.exception;
-
-public class NotFoundException extends RuntimeException {
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/LegacyPDFStreamEngine.java

@@ -1,377 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.iqser.red.service.redaction.v1.server.parsing;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.fontbox.ttf.TrueTypeFont;
-import org.apache.fontbox.util.BoundingBox;
-
-import org.apache.pdfbox.contentstream.PDFStreamEngine;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDCIDFont;
-import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
-import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
-import org.apache.pdfbox.pdmodel.font.PDType0Font;
-import org.apache.pdfbox.pdmodel.font.PDType3Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.pdfbox.util.Matrix;
-import org.apache.pdfbox.util.Vector;
-import org.apache.pdfbox.contentstream.operator.DrawObject;
-import org.apache.pdfbox.contentstream.operator.state.Concatenate;
-import org.apache.pdfbox.contentstream.operator.state.Restore;
-import org.apache.pdfbox.contentstream.operator.state.Save;
-import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
-import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
-import org.apache.pdfbox.contentstream.operator.text.BeginText;
-import org.apache.pdfbox.contentstream.operator.text.EndText;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
-import org.apache.pdfbox.contentstream.operator.text.MoveText;
-import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
-import org.apache.pdfbox.contentstream.operator.text.NextLine;
-import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
-import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
-import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
-import org.apache.pdfbox.contentstream.operator.text.ShowText;
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
-
-/**
- * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
- *
- * This class exists only so that we don't break the code of users who have their own subclasses of
- * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
- * with a heuristic implementation which is backwards compatible.
- *
- * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
- * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
- */
-@SuppressWarnings({"PMD", "checkstyle:all"})
-class LegacyPDFStreamEngine extends PDFStreamEngine
-{
-    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
-
-    private int pageRotation;
-    private PDRectangle pageSize;
-    private Matrix translateMatrix;
-    private final GlyphList glyphList;
-    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
-
-    /**
-     * Constructor.
-     */
-    LegacyPDFStreamEngine() throws IOException
-    {
-        addOperator(new BeginText());
-        addOperator(new Concatenate());
-        addOperator(new DrawObject()); // special text version
-        addOperator(new EndText());
-        addOperator(new SetGraphicsStateParameters());
-        addOperator(new Save());
-        addOperator(new Restore());
-        addOperator(new NextLine());
-        addOperator(new SetCharSpacing());
-        addOperator(new MoveText());
-        addOperator(new MoveTextSetLeading());
-        addOperator(new SetFontAndSize());
-        addOperator(new ShowText());
-        addOperator(new ShowTextAdjusted());
-        addOperator(new SetTextLeading());
-        addOperator(new SetMatrix());
-        addOperator(new SetTextRenderingMode());
-        addOperator(new SetTextRise());
-        addOperator(new SetWordSpacing());
-        addOperator(new SetTextHorizontalScaling());
-        addOperator(new ShowTextLine());
-        addOperator(new ShowTextLineAndSpace());
-
-        // load additional glyph list for Unicode mapping
-        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
-        InputStream input = GlyphList.class.getResourceAsStream(path);
-        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
-    }
-
-    /**
-     * This will initialize and process the contents of the stream.
-     *
-     * @param page the page to process
-     * @throws java.io.IOException if there is an error accessing the stream.
-     */
-    @Override
-    public void processPage(PDPage page) throws IOException
-    {
-        this.pageRotation = page.getRotation();
-        this.pageSize = page.getCropBox();
-
-        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0)
-        {
-            translateMatrix = null;
-        }
-        else
-        {
-            // translation matrix for cropbox
-            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
-        }
-        super.processPage(page);
-    }
-
-    /**
-     * Called when a glyph is to be processed. The heuristic calculations here were originally
-     * written by Ben Litchfield for PDFStreamEngine.
-     */
-    @Override
-    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code,
-            String unicode,
-            Vector displacement)
-            throws IOException
-    {
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        PDGraphicsState state = getGraphicsState();
-        Matrix ctm = state.getCurrentTransformationMatrix();
-        float fontSize = state.getTextState().getFontSize();
-        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
-        Matrix textMatrix = getTextMatrix();
-
-        float displacementX = displacement.getX();
-        // the sorting algorithm is based on the width of the character. As the displacement
-        // for vertical characters doesn't provide any suitable value for it, we have to 
-        // calculate our own
-        if (font.isVertical())
-        {
-            displacementX = font.getWidth(code) / 1000;
-            // there may be an additional scaling factor for true type fonts
-            TrueTypeFont ttf = null;
-            if (font instanceof PDTrueTypeFont)
-            {
-                ttf = ((PDTrueTypeFont)font).getTrueTypeFont();
-            }
-            else if (font instanceof PDType0Font)
-            {
-                PDCIDFont cidFont = ((PDType0Font)font).getDescendantFont();
-                if (cidFont instanceof PDCIDFontType2)
-                {
-                    ttf = ((PDCIDFontType2)cidFont).getTrueTypeFont();
-                }
-            }
-            if (ttf != null && ttf.getUnitsPerEm() != 1000)
-            {
-                displacementX *= 1000f / ttf.getUnitsPerEm();
-            }
-        }
-
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        // (modified) combined displacement, this is calculated *without* taking the character
-        // spacing and word spacing into account, due to legacy code in TextStripper
-        float tx = displacementX * fontSize * horizontalScaling;
-        float ty = displacement.getY() * fontSize;
-
-        // (modified) combined displacement matrix
-        Matrix td = Matrix.getTranslateInstance(tx, ty);
-
-        // (modified) text rendering matrix
-        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
-        float nextX = nextTextRenderingMatrix.getTranslateX();
-        float nextY = nextTextRenderingMatrix.getTranslateY();
-
-        // (modified) width and height calculations
-        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
-        Float fontHeight = fontHeightMap.get(font.getCOSObject());
-        if (fontHeight == null)
-        {
-            fontHeight = computeFontHeight(font);
-            fontHeightMap.put(font.getCOSObject(), fontHeight);
-        }
-        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
-
-        //
-        // start of the original method
-        //
-
-        // Note on variable names. There are three different units being used in this code.
-        // Character sizes are given in glyph units, text locations are initially given in text
-        // units, and we want to save the data in display units. The variable names should end with
-        // Text or Disp to represent if the values are in text or disp units (no glyph units are
-        // saved).
-
-        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
-        if (font instanceof PDType3Font)
-        {
-            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
-        }
-
-        float spaceWidthText = 0;
-        try
-        {
-            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
-            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
-        }
-        catch (Throwable exception)
-        {
-            LOG.warn(exception, exception);
-        }
-
-        if (spaceWidthText == 0)
-        {
-            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
-            // the average space width appears to be higher than necessary so make it smaller
-            spaceWidthText *= .80f;
-        }
-        if (spaceWidthText == 0)
-        {
-            spaceWidthText = 1.0f; // if could not find font, use a generic value
-        }
-
-        // the space width has to be transformed into display units
-        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
-
-        // use our additional glyph list for Unicode mapping
-        String unicodeMapping = font.toUnicode(code, glyphList);
-
-        // when there is no Unicode mapping available, Acrobat simply coerces the character code
-        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
-        // this, which is why we leave it until this point in PDFTextStreamEngine.
-        if (unicodeMapping == null)
-        {
-            if (font instanceof PDSimpleFont)
-            {
-                char c = (char) code;
-                unicodeMapping = new String(new char[] { c });
-            }
-            else
-            {
-                // Acrobat doesn't seem to coerce composite font's character codes, instead it
-                // skips them. See the "allah2.pdf" TestTextStripper file.
-                return;
-            }
-        }
-
-        // adjust for cropbox if needed
-        Matrix translatedTextRenderingMatrix;
-        if (translateMatrix == null)
-        {
-            translatedTextRenderingMatrix = textRenderingMatrix;
-        }
-        else
-        {
-            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
-            nextX -= pageSize.getLowerLeftX();
-            nextY -= pageSize.getLowerLeftY();
-        }
-
-        processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
-                pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
-                Math.abs(dyDisplay), dxDisplay,
-                Math.abs(spaceWidthDisplay), unicodeMapping, new int[] { code }, font,
-                fontSize,
-                (int)(fontSize * textMatrix.getScalingFactorX())));
-    }
-
-    /**
-     * Compute the font height. Override this if you want to use own calculations.
-     * 
-     * @param font the font.
-     * @return the font height.
-     * 
-     * @throws IOException if there is an error while getting the font bounding box.
-     */
-    protected float computeFontHeight(PDFont font) throws IOException
-    {
-        BoundingBox bbox = font.getBoundingBox();
-        if (bbox.getLowerLeftY() < Short.MIN_VALUE)
-        {
-            // PDFBOX-2158 and PDFBOX-3130
-            // files by Salmat eSolutions / ClibPDF Library
-            bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536));
-        }
-        // 1/2 the bbox is used as the height todo: why?
-        float glyphHeight = bbox.getHeight() / 2;
-
-        // sometimes the bbox has very high values, but CapHeight is OK
-        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
-        if (fontDescriptor != null)
-        {
-            float capHeight = fontDescriptor.getCapHeight();
-            if (Float.compare(capHeight, 0) != 0 &&
-                    (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0))
-            {
-                glyphHeight = capHeight;
-            }
-            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
-            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
-            float ascent = fontDescriptor.getAscent();
-            float descent = fontDescriptor.getDescent();
-            if (capHeight > ascent && ascent > 0 && descent < 0 &&
-                    ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0))
-            {
-                glyphHeight = (ascent - descent) / 2;
-            }
-        }
-
-        // transformPoint from glyph space -> text space
-        float height;
-        if (font instanceof PDType3Font)
-        {
-            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
-        }
-        else
-        {
-            height = glyphHeight / 1000;
-        }
-
-        return height;
-    }
-
-    /**
-     * A method provided as an event interface to allow a subclass to perform some specific
-     * functionality when text needs to be processed.
-     *
-     * @param text The text to be processed.
-     */
-    protected void processTextPosition(TextPosition text)
-    {
-        // subclasses can override to provide specific functionality
-    }
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/PDFLinesTextStripper.java

@@ -1,33 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.parsing;
 
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-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.color.*;
+import org.apache.pdfbox.contentstream.operator.state.*;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -36,17 +19,16 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;
 
-import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
@@ -124,9 +106,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
                     // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                     if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
+                                .getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
+                                .getX(), path_y)));
                     }
 
                     path_x = (float) pos.getX();
@@ -147,19 +131,25 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                     Point2D p2 = transformPosition(x + width, y + height);
 
                     // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p2.getY())));
 
                     // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                     if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p2.getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p1.getY())));
                     }
                     if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p2.getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p1.getY())));
                     }
                 }
                 break;
@@ -183,9 +173,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 graphicsPath.clear();
                 break;
 
-//            case OperatorName.DRAW_OBJECT:
-//                processImageOperation(arguments);
-//                break;
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
 
         }
 
@@ -199,7 +189,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             COSName objectName = (COSName) arguments.get(0);
             PDXObject xobject = getResources().getXObject(objectName);
             if (xobject instanceof PDImageXObject) {
-                PDImageXObject image = (PDImageXObject) xobject;
+                PDImageXObject image = (PDImageXObject)xobject;
                 Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
 
                 Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
@@ -208,9 +198,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
 
                 if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage()
-                            .getColorModel()
-                            .hasAlpha()));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
                 }
             }
         } catch (Exception e) {
@@ -219,6 +207,8 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     }
 
 
+
+
     private float floatValue(COSBase value) {
 
         if (value instanceof COSNumber) {
@@ -257,16 +247,8 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     public void writeString(String text, List<TextPosition> textPositions) throws IOException {
 
         int startIndex = 0;
-        RedTextPosition previous = null;
-
         for (int i = 0; i <= textPositions.size() - 1; i++) {
 
-            if (!textPositionSequences.isEmpty()) {
-                previous = textPositionSequences.get(textPositionSequences.size() - 1)
-                        .getTextPositions()
-                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
-            }
-
             int charWidth = (int) textPositions.get(i).getWidthDirAdj();
             if (charWidth < minCharWidth) {
                 minCharWidth = charWidth;
@@ -285,58 +267,42 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
             if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                     .getUnicode()
-                    .equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
+                    .equals("\u00A0"))) {
                 startIndex++;
                 continue;
             }
 
             // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
+            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
             }
 
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
-                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
             }
 
+
             if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                     .getUnicode()
-                    .equals("\u00A0") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\t")) && i <= textPositions.size() - 2) {
+                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
-
-                    // Remove false sequence ends (whitespaces)
-                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
-                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
-                        for (TextPosition t : sublist) {
-                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
-                        }
-                    } else {
-                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                    }
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i + 1;
             }
@@ -345,23 +311,13 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
         if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                 .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1)
-                .getUnicode()
-                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
             sublist = sublist.subList(0, sublist.size() - 1);
         }
-
         if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                 .getUnicode()
-                .equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
-            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
-                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
-                for (TextPosition t : sublist) {
-                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
-                }
-            } else {
-                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-            }
+                .equals("\u00A0")))) {
+            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
         }
         super.writeString(text);
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java

@@ -21,8 +21,6 @@ public class RedTextPosition {
     private float YDirAdj;
     private float width;
     private float heightDir;
-    private float widthDirAdj;
-    private float dir;
 
     // not used in reanalysis
     @JsonIgnore

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java

@@ -1,24 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.text.TextPosition;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.text.TextPosition;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
-@Slf4j
 @Data
 @NoArgsConstructor
-@JsonIgnoreProperties({"empty"})
+@JsonIgnoreProperties({ "empty" })
 public class TextPositionSequence implements CharSequence {
 
     private int page;
@@ -27,15 +23,12 @@ public class TextPositionSequence implements CharSequence {
     private float x1;
     private float x2;
 
-
     public TextPositionSequence(int page) {
-
         this.page = page;
     }
 
 
     public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
-
         var textPositionSequence = new TextPositionSequence();
         textPositionSequence.textPositions = textPositions;
         textPositionSequence.page = page;
@@ -51,6 +44,9 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
+
+
+
     @Override
     public int length() {
 
@@ -133,7 +129,6 @@ public class TextPositionSequence implements CharSequence {
         }
     }
 
-
     @JsonIgnore
     public float getRotationAdjustedY() {
 
@@ -141,13 +136,6 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    @JsonIgnore
-    public float getRotationAdjustedX() {
-
-        return textPositions.get(0).getXDirAdj();
-    }
-
-
     @JsonIgnore
     public float getY1() {
 
@@ -193,8 +181,10 @@ public class TextPositionSequence implements CharSequence {
 
     @JsonIgnore
     public String getFont() {
-
-        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
+        return textPositions.get(0).getFontName()
+                .toLowerCase()
+                .replaceAll(",bold", "")
+                .replaceAll(",italic", "");
     }
 
 
@@ -215,33 +205,27 @@ public class TextPositionSequence implements CharSequence {
 
     }
 
-
     @JsonIgnore
     public float getFontSize() {
 
         return textPositions.get(0).getFontSizeInPt();
     }
 
-
     @JsonIgnore
     public float getSpaceWidth() {
 
         return textPositions.get(0).getWidthOfSpace();
     }
 
-
     @JsonIgnore
     public int getRotation() {
 
         return textPositions.get(0).getRotation();
     }
 
-
     @JsonIgnore
     public Rectangle getRectangle() {
 
-        log.debug("Page: '{}', Word: '{}', Rotation: '{}'", page, toString(), textPositions.get(0).getRotation());
-
         float height = getTextHeight();
 
         float posXInit = getX1();
@@ -249,59 +233,26 @@ public class TextPositionSequence implements CharSequence {
         float posYInit;
         float posYEnd;
 
-        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
+        if (textPositions.get(0).getRotation() == 90) {
             posXEnd = textPositions.get(0).getYDirAdj() + 2;
             posYInit = getY1();
             posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
+        } else if (textPositions.get(0).getRotation() == 270) {
             posYInit = textPositions.get(0).getPageHeight() - getX1();
             posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
                     .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
             posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
             posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                     .getYDirAdj() + height;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = posYInit + 1;
-            posXInit = textPositions.get(0).getXDirAdj();
-            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
-                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
-
-        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
-            posXInit = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
-            posXEnd = textPositions.get(0).getXDirAdj();
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + 2;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
-            posYInit = getX1();
-            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
-                    .getWidthDirAdj() - 3;
-            posXInit = textPositions.get(0).getYDirAdj() + 2;
-            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
-
         } else {
             posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
             posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
             posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
                     .getYDirAdj() + 2;
         }
 
-        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
-        log.debug("Rectangle: {}", rectangle);
-        return rectangle;
+        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java

@@ -7,7 +7,6 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.NerAnalyserService;
 
 import lombok.RequiredArgsConstructor;
@@ -29,7 +28,6 @@ public class RedactionMessageReceiver {
     private final AnalyzeService analyzeService;
     private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
     private final NerAnalyserService nerAnalyserService;
-    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
 
 
     @RabbitHandler
@@ -38,37 +36,22 @@ public class RedactionMessageReceiver {
 
         var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
         log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
-        AnalyzeResult result = null;
+        AnalyzeResult result;
+        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
+            result = analyzeService.reanalyze(analyzeRequest);
+            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+        } else {
+            // TODO Seperate stucture analysis by other queue
+            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
-        switch (analyzeRequest.getMessageType()){
+            // TODO NerEntities should be computed and stored in entity-recognition-service, should be triggered by a seperate queue after structure analysis
+            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
 
-            case REANALYSE:
-                result = analyzeService.reanalyze(analyzeRequest);
-                log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
-            case FULL_ANALYSE:
-                // TODO Seperate stucture analysis by other queue
-                analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-
-                // TODO NerEntities should be computed and stored in entity-recognition-service, should be triggered by a seperate queue after structure analysis
-                nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-
-                result = analyzeService.analyze(analyzeRequest);
-                log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result
-                        .getDuration());
-
-                break;
-            case SURROUNDING_TEXT:
-                var manualRedactions = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
-                result = AnalyzeResult.builder()
-                        .dossierId(analyzeRequest.getDossierId())
-                        .fileId(analyzeRequest.getFileId())
-                        .manualRedactions(manualRedactions)
-                        .build();
-                break;
+            result = analyzeService.analyze(analyzeRequest);
+            log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result
+                    .getDuration());
         }
 
-        result.setMessageType(analyzeRequest.getMessageType());
         fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Dictionary.java

@@ -65,13 +65,13 @@ public class Dictionary {
     public boolean containsValue(String type, String value) {
 
         return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getValues(false)
+                .getEntries().stream().map(DictionaryEntry::getValue).collect(toSet())
                 .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getValues(true)
+                .getLocalEntries()
                 .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getValues(false)
+                .getEntries().stream().map(DictionaryEntry::getValue).collect(toSet())
                 .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getValues(true)
+                .getLocalEntries()
                 .contains(value);
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java

@@ -42,8 +42,6 @@ public class Entity implements ReasonHolder {
 
     private boolean isDossierDictionaryEntry;
 
-    private boolean ignored;
-
     private Set<Engine> engines = new HashSet<>();
 
     private Set<Entity> references = new HashSet<>();

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java

@@ -20,7 +20,6 @@ public class Image implements ReasonHolder {
     private int sectionNumber;
     private String section;
     private int page;
-    private boolean ignored;
     private boolean hasTransparency;
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/PdfImage.java

@@ -16,7 +16,6 @@ public class PdfImage {
     private BufferedImage image;
     @NonNull
     private RedRectangle2D position;
-    @NonNull
     private ImageType imageType;
     private boolean isAppendedToParagraph;
     private boolean hasTransparency;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java

@@ -1,34 +1,26 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.iqser.red.service.redaction.v1.model.ArgumentType;
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.model.FileAttribute;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
 
 @Data
 @Slf4j
@@ -70,69 +62,39 @@ public class Section {
     @WhenCondition
     public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
                                            @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
                                                     @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
                                               @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
                                                      @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
                                                               @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
                                                         @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()))
-                .findFirst()
-                .isPresent();
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
     }
 
-
     @WhenCondition
     public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName,
                              @Argument(ArgumentType.STRING) String value) {
@@ -144,7 +106,6 @@ public class Section {
                 .equals(value);
     }
 
-
     @WhenCondition
     public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {
 
@@ -152,50 +113,31 @@ public class Section {
         return tabularData != null && tabularData.containsKey(cleanHeaderName);
     }
 
-
     @WhenCondition
     public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {
 
-        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
+        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
     }
 
-
     @WhenCondition
     public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {
 
-        return images.stream().anyMatch(image -> !image.isIgnored() && image.getType().equals(type));
+        return images.stream().anyMatch(image -> image.getType().equals(type));
     }
 
-
     @WhenCondition
     public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {
 
         return StringUtils.containsIgnoreCase(headline, word);
     }
 
-
     @ThenAction
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.REGEX) String pattern,
                               @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                               @Argument(ArgumentType.INTEGER) int group) {
 
-        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
-    }
-
-
-    @ThenAction
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.REGEX) String valuePattern) {
-
-        Pattern compiledValuePattern = null;
-
-        if (valuePattern != null) {
-            compiledValuePattern = Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        }
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
 
         Set<Entity> expanded = new HashSet<>();
         for (Entity entity : entities) {
@@ -204,21 +146,14 @@ public class Section {
                 continue;
             }
 
-            if (valuePattern != null) {
-                Matcher valueMatcher = compiledValuePattern.matcher(entity.getWord());
-                if (!valueMatcher.matches()) {
-                    continue;
-                }
-            }
-
             Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
 
             while (matcher.find()) {
                 String match = matcher.group(group);
-
                 if (StringUtils.isNotBlank(match)) {
-                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis());
-                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
+                    expanded.addAll(findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
+                            .getRedactionReason(), entity.getLegalBasis()));
+
                 }
             }
         }
@@ -227,7 +162,6 @@ public class Section {
         EntitySearchUtils.removeEntitiesContainedInLarger(entities);
     }
 
-
     @ThenAction
     public void redactImage(@Argument(ArgumentType.TYPE) String type,
                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
@@ -244,9 +178,9 @@ public class Section {
         });
     }
 
-
     @ThenAction
-    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+    public void redact(@Argument(ArgumentType.TYPE) String type,
+                       @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                        @Argument(ArgumentType.STRING) String reason,
                        @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
@@ -263,7 +197,6 @@ public class Section {
         });
     }
 
-
     @ThenAction
     public void redactNotImage(@Argument(ArgumentType.TYPE) String type,
                                @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
@@ -278,9 +211,9 @@ public class Section {
         });
     }
 
-
     @ThenAction
-    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+    public void redactNot(@Argument(ArgumentType.TYPE) String type,
+                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                           @Argument(ArgumentType.STRING) String reason) {
 
         boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
@@ -296,22 +229,15 @@ public class Section {
     }
 
 
-    public void ignore(String type){
-        entities.removeIf(entity -> entity.getType().equals(type));
-    }
-
-
     @ThenAction
     public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type,
                                       @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                      @Argument(ArgumentType.STRING) String reason) {
+                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                          @Argument(ArgumentType.STRING) String reason) {
 
         boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
 
-        Set<Entity> references = entities.stream()
-                .filter(entity -> entity.getType().equals(referenceType))
-                .collect(Collectors.toSet());
+        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
 
         entities.forEach(entity -> {
             if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
@@ -325,6 +251,7 @@ public class Section {
     }
 
 
+
     @ThenAction
     public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type,
                                               @Argument(ArgumentType.STRING) String pattern,
@@ -355,7 +282,6 @@ public class Section {
         EntitySearchUtils.removeEntitiesContainedInLarger(entities);
     }
 
-
     @ThenAction
     public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
@@ -375,7 +301,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix,
                                    @Argument(ArgumentType.TYPE) String type,
@@ -393,7 +318,6 @@ public class Section {
         });
     }
 
-
     @ThenAction
     public void addHintAnnotation(@Argument(ArgumentType.STRING) String value,
                                   @Argument(ArgumentType.TYPE) String asType) {
@@ -402,9 +326,9 @@ public class Section {
         EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
     }
 
-
     @ThenAction
-    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType,
+    public void addRedaction(@Argument(ArgumentType.STRING) String value,
+                             @Argument(ArgumentType.TYPE) String asType,
                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                              @Argument(ArgumentType.STRING) String reason,
                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -413,9 +337,9 @@ public class Section {
         EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
     }
 
-
     @ThenAction
-    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType,
+    public void redactLineAfter(@Argument(ArgumentType.STRING) String start,
+                                @Argument(ArgumentType.TYPE) String asType,
                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                 @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                 @Argument(ArgumentType.STRING) String reason,
@@ -437,7 +361,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void recommendLineAfter(@Argument(ArgumentType.STRING) String start,
                                    @Argument(ArgumentType.TYPE) String asType) {
@@ -463,11 +386,11 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
                               @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.INTEGER) int group,
+                              @Argument(ArgumentType.TYPE) String asType,
                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                               @Argument(ArgumentType.STRING) String reason,
                               @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -485,7 +408,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
@@ -504,7 +426,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
                                           @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
@@ -527,9 +448,9 @@ public class Section {
         }
     }
 
-
     @ThenAction
-    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop,
+    public void redactBetween(@Argument(ArgumentType.STRING) String start,
+                              @Argument(ArgumentType.STRING) String stop,
                               @Argument(ArgumentType.TYPE) String asType,
                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                               @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
@@ -553,7 +474,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
                                    @Argument(ArgumentType.STRING) String stop,
@@ -588,7 +508,6 @@ public class Section {
         }
     }
 
-
     @ThenAction
     public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader,
                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
@@ -597,10 +516,10 @@ public class Section {
         annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
     }
 
-
     @ThenAction
     public void redactCell(@Argument(ArgumentType.STRING) String cellHeader,
-                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
+                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                           @Argument(ArgumentType.TYPE) String type,
                            @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
                            @Argument(ArgumentType.STRING) String reason,
                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -608,7 +527,6 @@ public class Section {
         annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
     }
 
-
     @ThenAction
     public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader,
                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
@@ -695,7 +613,6 @@ public class Section {
         }
     }
 
-
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
     public @interface WhenCondition {
@@ -713,7 +630,6 @@ public class Section {
     public @interface Argument {
 
         ArgumentType value() default ArgumentType.STRING;
-
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Classification.java

@@ -1,14 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import lombok.Data;
-
-@Data
-public class Classification {
-
-    private Map<String, Float> probabilities = new HashMap<>();
-    private String label;
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/FilterGeometry.java

@@ -1,10 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class FilterGeometry {
-
-    private ImageSize imageSize;
-    private ImageFormat imageFormat;
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Filters.java

@@ -1,11 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Filters {
-
-    private FilterGeometry geometry;
-    private Probability probability;
-    private boolean allPassed;
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Geometry.java

@@ -1,9 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Geometry {
-    private float width;
-    private float height;
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageFormat.java

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageFormat {
-
-    private float quotient;
-    private boolean tooTall;
-    private boolean tooWide;
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageMetadata.java

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageMetadata {
-
-    private Classification classification;
-    private Position position;
-    private Geometry geometry;
-    private Filters filters;
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java

@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class ImageServiceResponse {
-
-    private String dossierId;
-    private String fileId;
-    private List<ImageMetadata> imageMetadata = new ArrayList<>();
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageSize.java

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageSize {
-
-    private float quotient;
-    private boolean tooLarge;
-    private boolean tooSmall;
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Position.java

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Position {
-    private float x1;
-    private float x2;
-    private float y1;
-    private float y2;
-    private int pageNumber;
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Probability.java

@@ -1,10 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Probability {
-
-    private boolean unconfident;
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java

@@ -10,12 +10,16 @@ import java.util.stream.Stream;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
@@ -26,10 +30,8 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncre
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
@@ -55,7 +57,6 @@ public class AnalyzeService {
     private final SectionTextBuilderService sectionTextBuilderService;
     private final SectionGridCreatorService sectionGridCreatorService;
     private final NerAnalyserService nerAnalyserService;
-    private final ImageService imageService;
 
 
     public void analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
@@ -66,15 +67,9 @@ public class AnalyzeService {
         Document classifiedDoc;
 
         try {
-
             var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
                     .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
-
-            Map<Integer, List<PdfImage>> pdfImages = null;
-            if(redactionServiceSettings.isEnableImageClassification()) {
-                pdfImages = imageService.convertImages(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            }
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, pdfImages);
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
             pageCount = classifiedDoc.getPages().size();
         } catch (Exception e) {
             throw new RedactionException(e);
@@ -83,15 +78,7 @@ public class AnalyzeService {
         List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
         sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
 
-        Text text = new Text(pageCount,sectionTexts);
-
-        // enhance section grid with headline data
-        sectionTexts.forEach(sectionText -> classifiedDoc
-                .getSectionGrid().getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
-                        sectionText.getHeadline(),
-                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
-                        sectionText.getSectionAreas())));
-
+        Text text = new Text(pageCount, sectionTexts);
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
                 .getSectionGrid());

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnnotationService.java

@@ -169,12 +169,12 @@ public class AnnotationService {
 
     private float[] toQuadPoint(Rectangle rectangle, PDRectangle mediaBox, PDRectangle cropBox) {
 
-        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
-        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
+        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
         var x2 = rectangle.getTopLeft()
-                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
         var y2 = rectangle.getTopLeft()
-                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
 
         // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
         // of the area to be highlighted

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java

@@ -122,7 +122,7 @@ public class DictionaryService {
 
         dictionary.getDictionaryModels().forEach(dm -> {
             if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false, true);
+                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false);
                 long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
                 if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
                     dictionary.getVersion().setDossierTemplateVersion(externalVersion);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java

@@ -10,9 +10,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
@@ -84,42 +82,19 @@ public class EntityRedactionService {
                 surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
             }
 
-            if (!local && analyzeRequest.getManualRedactions() != null) {
-
-                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
-                        .filter(fr -> fr.getStatus() == AnnotationStatus.APPROVED)
-                        .filter(fr -> fr.getRequestDate() != null)
-                        .collect(Collectors.toList());
-                // only approved id removals, that haven't been forced back afterwards
-                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
-                        .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED)
-                        .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
-                        .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());
-
-                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
-                        .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
-                    for (Image image : reanalysisSection.getImages()) {
-                        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
-                        for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
-                                .getImageRecategorization()) {
-                            if (imageRecategorization.getStatus()
-                                    .equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
-                                    .equals(imageId)) {
-                                image.setType(imageRecategorization.getType());
-                            }
-                        }
-                        if (idsToRemove.contains(imageId)) {
-                            image.setIgnored(true);
+            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
+                    .getImageRecategorization() != null) {
+                for (Image image : reanalysisSection.getImages()) {
+                    String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+                    for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
+                            .getImageRecategorization()) {
+                        if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
+                                .equals(imageId)) {
+                            image.setType(imageRecategorization.getType());
                         }
                     }
                 }
-
-                entities.forEach(entity -> entity.getPositionSequences().forEach(ps -> {
-                    if (idsToRemove.contains(ps.getId())) {
-                        entity.setIgnored(true);
-                    }
-                }));
             }
 
             sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
@@ -174,8 +149,7 @@ public class EntityRedactionService {
                         .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                 .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                 .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity
-                                .getReferences()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity.getReferences()));
             }
         }
         return entitiesPerPage;
@@ -235,18 +209,18 @@ public class EntityRedactionService {
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
                 EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY));
             } else {
                 EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY));
             }
         }
 
         if (!local) {
             Map<String, Set<String>> nerValuesPerType = getNerValues(sectionNumber, nerEntities, cellstarts);
             nerValuesPerType.entrySet().forEach(entry -> {
-                EntitySearchUtils.addEntitiesWithHigherRank(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
-                        .getKey(), headline, sectionNumber, false, false, Engine.NER), dictionary);
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
+                        .getKey(), headline, sectionNumber, false, false, Engine.NER));
             });
         }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ImageClassificationService.java

@@ -0,0 +1,71 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
+import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.io.ByteArrayOutputStream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageClassificationService {
+
+    private final ImageClassificationClient imageClassificationClient;
+    private final RedactionServiceSettings settings;
+
+
+    public void classifyImages(Page page) {
+
+        page.getImages().forEach(image -> {
+
+            if (settings.isEnableImageClassification() && !isEntirePageImage(image, page)) {
+
+                long start = System.currentTimeMillis();
+                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                    ImageIO.write(image.getImage(), "png", baos);
+                    var mockFile = new MockMultipartFile("file", "Image.png", "image/png", baos.toByteArray());
+                    ImageClassificationResponse response = imageClassificationClient.classify(mockFile);
+                    image.setImageType(ImageType.valueOf(response.getCategory()));
+                } catch (Exception e) {
+                    log.error("Could not classify image", e);
+                    image.setImageType(ImageType.OTHER);
+                }
+                log.info("Image classification took: " + (System.currentTimeMillis() - start));
+            } else {
+                image.setImageType(ImageType.OTHER);
+            }
+
+            image.getImage().flush();
+            image.setImage(null);
+
+            if (image.getImageType().equals(ImageType.OTHER)) {
+                page.getTextBlocks().forEach(textblock -> {
+                    if (image.getPosition()
+                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
+                        image.setImageType(ImageType.OCR);
+                    }
+                });
+            }
+        });
+
+    }
+
+    private boolean isEntirePageImage(PdfImage image, Page page){
+        double imageArea = image.getPosition().getHeight() * image.getPosition().getWidth();
+        if(imageArea / page.getCropBoxArea() >= settings.getMaxImageCropboxRatio()){
+            log.info("Skipping image classification because images is almost as large as the entire page");
+            return true;
+        }
+        return false;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java

@@ -1,141 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.Text;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class ManualRedactionSurroundingTextService {
-
-    private final RedactionStorageService redactionStorageService;
-    private final SurroundingWordsService surroundingWordsService;
-
-
-    public ManualRedactions addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
-
-        Text text = redactionStorageService.getText(dossierId, fileId);
-        List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
-        List<ManualResizeRedaction> processedResizeRedactions = new ArrayList<>();
-
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (manualRedactions.getEntriesToAdd().isEmpty() && manualRedactions.getResizeRedactions().isEmpty()) {
-                break;
-            }
-
-            for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-
-                var addItty = manualRedactions.getEntriesToAdd().iterator();
-                while (addItty.hasNext()) {
-                    var manualAddRedaction = addItty.next();
-                    if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction
-                                .getPositions());
-                        manualAddRedaction.setTextBefore(surroundingText.getLeft());
-                        manualAddRedaction.setTextAfter(surroundingText.getRight());
-                        processedAddRedactions.add(manualAddRedaction);
-                        addItty.remove();
-                    }
-                }
-
-                var resizeItty = manualRedactions.getResizeRedactions().iterator();
-                while (resizeItty.hasNext()) {
-                    var manualResizeRedaction = resizeItty.next();
-                    if (sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction
-                                .getPositions());
-                        manualResizeRedaction.setTextBefore(surroundingText.getLeft());
-                        manualResizeRedaction.setTextAfter(surroundingText.getRight());
-                        processedResizeRedactions.add(manualResizeRedaction);
-                        resizeItty.remove();
-                    }
-                }
-            }
-        }
-
-        manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
-        manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
-        return manualRedactions;
-    }
-
-
-    private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
-                                                     List<Rectangle> toFindPositions) {
-
-        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText
-                .getSectionNumber(), false, false, Engine.DICTIONARY);
-        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
-
-        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
-
-        if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText
-                    .getCellStarts());
-        } else {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null);
-        }
-
-        return Pair.of(correctEntity.getTextBefore(), correctEntity.getTextAfter());
-    }
-
-
-    private boolean sectionContainsEntry(SectionArea sectionArea, List<Rectangle> positions) {
-
-        for (Rectangle position : positions) {
-            if (sectionArea.contains(position)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    private Entity getEntityOnCorrectPosition(Set<Entity> entitiesWithPositions, List<Rectangle> toFindPositions) {
-
-        for (Entity entityWithPos : entitiesWithPositions) {
-            for (EntityPositionSequence entityPositionSequence : entityWithPos.getPositionSequences()) {
-                for (TextPositionSequence textPositionSequence : entityPositionSequence.getSequences()) {
-                    for (Rectangle manualRedactionRectangle : toFindPositions) {
-                        if (intersects(manualRedactionRectangle, textPositionSequence.getRectangle())) {
-                            return entityWithPos;
-                        }
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    public boolean intersects(Rectangle manualPosition,
-                              com.iqser.red.service.redaction.v1.model.Rectangle textPositionRectangle) {
-
-        return textPositionRectangle.getTopLeft()
-                .getX() + textPositionRectangle.getWidth() > manualPosition.getTopLeftX() && textPositionRectangle.getTopLeft()
-                .getY() + textPositionRectangle.getHeight() > manualPosition.getTopLeftY() && textPositionRectangle.getTopLeft()
-                .getX() < manualPosition.getTopLeftX() + manualPosition.getWidth() && textPositionRectangle.getTopLeft()
-                .getY() < manualPosition.getTopLeftY() + manualPosition.getHeight();
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionChangeLogService.java

@@ -50,13 +50,7 @@ public class RedactionChangeLogService {
                         .equals(ChangeType.REMOVED))
                 .collect(Collectors.toList());
 
-        Set<RedactionLogEntry> added = new HashSet<>(currentRedactionLog.getRedactionLogEntry().stream()
-                .filter(entry -> entry.getChanges().isEmpty() || !entry.getChanges()
-                        .get(entry.getChanges().size() - 1)
-                        .getType()
-                        .equals(ChangeType.REMOVED))
-                .collect(Collectors.toList()));
-
+        Set<RedactionLogEntry> added = new HashSet<>(currentRedactionLog.getRedactionLogEntry());
         added.removeAll(notRemovedPreviousEntries);
 
         Set<RedactionLogEntry> removed = new HashSet<>(notRemovedPreviousEntries);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java

@@ -1,15 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
@@ -20,20 +10,21 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionS
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
-@Slf4j
 @RequiredArgsConstructor
 public class RedactionLogCreatorService {
 
     private final DictionaryService dictionaryService;
 
 
-    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
-                                                      String dossierTemplateId) {
+    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages, String dossierTemplateId) {
 
         List<RedactionLogEntry> entries = new ArrayList<>();
 
@@ -138,27 +129,16 @@ public class RedactionLogCreatorService {
         if (textPositions.size() == 1) {
             rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
         } else {
-            float x = textPositions.get(0).getXDirAdj();
             float y = textPositions.get(0).getYDirAdj();
-            float width = textPositions.get(0).getWidthDirAdj();
-            float height = textPositions.get(0).getHeightDir();
             int startIndex = 0;
-
             for (int i = 1; i < textPositions.size(); i++) {
-                float xDirAdj = textPositions.get(i).getXDirAdj();
                 float yDirAdj = textPositions.get(i).getYDirAdj();
-                float widthDir = textPositions.get(i).getWidthDirAdj();
-                float heightDir = textPositions.get(i).getHeightDir();
-
-                if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
+                if (yDirAdj != y) {
                     rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
                             .getRectangle());
                     y = yDirAdj;
-                    width = widthDir;
-                    height = heightDir;
                     startIndex = i;
                 }
-                x = xDirAdj;
             }
             if (startIndex != textPositions.size()) {
                 rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
@@ -170,34 +150,6 @@ public class RedactionLogCreatorService {
     }
 
 
-    private boolean isCharClose(float x, float xDirAdj, float width) {
-
-        float max = x + (5 * width);
-        if (xDirAdj < max) {
-            return true;
-        }
-        return false;
-    }
-
-
-    private boolean isCharInSameLine(float y, float yCompare, float height, float heightCompare) {
-
-        float offsetHeight = height / 2;
-        float minHeight = height - offsetHeight;
-        float maxHeight = height + offsetHeight;
-
-        float offsetY = height / 10;
-        float minY = y - offsetY;
-        float maxY = y + offsetY;
-
-        if (yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight) {
-            return true;
-        }
-
-        return false;
-    }
-
-
     private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {
 
         Set<String> referenceIds = new HashSet<>();
@@ -247,4 +199,5 @@ public class RedactionLogCreatorService {
         return dictionaryService.isRecommendation(type, dossierTemplateId);
     }
 
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java

@@ -1,17 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -20,17 +30,14 @@ public class RedactionLogMergeService {
 
     private final DictionaryService dictionaryService;
 
-    private final SectionTextService sectionTextService;
 
-
-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                              String dossierTemplateId, ManualRedactions manualRedactions,
-                                              Set<Integer> excludedPages) {
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
 
         log.info("Merging Redaction log with manual redactions");
         if (manualRedactions != null) {
 
-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
 
             redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
 
@@ -46,7 +53,7 @@ public class RedactionLogMergeService {
 
                 if (excludedPages != null && !excludedPages.isEmpty()) {
                     entry.getPositions().forEach(pos -> {
-                        if (!entry.isManual() && excludedPages.contains(pos.getPage())) {
+                        if (excludedPages.contains(pos.getPage())) {
                             entry.setExcluded(true);
                         }
                     });
@@ -55,15 +62,6 @@ public class RedactionLogMergeService {
 
         }
 
-        Set<String> processedIds = new HashSet<>();
-        redactionLog.getRedactionLogEntry().removeIf(entry -> {
-            if (processedIds.contains(entry.getId())) {
-                log.info("Duplicate annotation found with id {}", entry.getId());
-                return true;
-            }
-            processedIds.add(entry.getId());
-            return false;
-        });
         return redactionLog;
     }
 
@@ -96,12 +94,6 @@ public class RedactionLogMergeService {
             }
         });
 
-        manualRedactions.getResizeRedactions().forEach(item -> {
-            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
-            }
-        });
-
         Collections.sort(manualRedactionWrappers);
 
         return manualRedactionWrappers;
@@ -119,21 +111,12 @@ public class RedactionLogMergeService {
                 if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
                     redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                     redactionLogEntry.setType(imageRecategorization.getType());
-                    redactionLogEntry.setHasBeenRecategorized(true);
-                    redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
-
-                    if (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setHint(true);
-                    } else {
-                        redactionLogEntry.setHint(false);
-                    }
-
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
                 } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
                     redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
                 } else {
                     redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
@@ -147,53 +130,45 @@ public class RedactionLogMergeService {
 
             if (mrw.getItem() instanceof IdRemoval) {
                 var manualRemoval = (IdRemoval) mrw.getItem();
-                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
-                    log.info("Skipping merge for dictionary-modifying entry");
+                String manualOverrideReason = null;
+                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setRedacted(false);
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), true));
+                } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                 } else {
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
-                        redactionLogEntry.setHint(false);
-                        redactionLogEntry.setHasBeenRemovedByManualOverride(true);
-                    } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                    } else {
-                        redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                    redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
             }
 
             if (mrw.getItem() instanceof ManualForceRedaction) {
                 var manualForceRedact = (ManualForceRedaction) mrw.getItem();
                 String manualOverrideReason = null;
                 if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    // Forcing a skipped hint should result in a hint
-                    if (dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId)) {
-                        redactionLogEntry.setHint(true);
-                    } else {
-                        redactionLogEntry.setRedacted(true);
-                    }
+                    redactionLogEntry.setRedacted(true);
                     redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
-                    redactionLogEntry.setHasBeenForced(true);
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                 } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
                     redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                 } else {
                     redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
@@ -213,18 +188,11 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
                     redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    redactionLogEntry.setRedacted(true);
-                    redactionLogEntry.setHasLegalBasisChanged(true);
-                    if (manualLegalBasisChange.getSection() != null) {
-                        redactionLogEntry.setSection(manualLegalBasisChange.getSection());
-                    }
-                    if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
-                        redactionLogEntry.setValue(manualLegalBasisChange.getValue());
-                    }
                 } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
                     redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
                 } else {
                     redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
@@ -236,36 +204,6 @@ public class RedactionLogMergeService {
                 redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
             }
 
-            if (mrw.getItem() instanceof ManualResizeRedaction) {
-                var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
-                String manualOverrideReason = null;
-                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
-                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
-                    redactionLogEntry.setValue(manualResizeRedact.getValue());
-                    redactionLogEntry.setHasBeenResized(true);
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
-                } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
-                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
-                } else {
-                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                }
-
-                redactionLogEntry.setManualRedactionUserId(manualResizeRedact.getUser());
-                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.setManual(true);
-                redactionLogEntry.setManualRedactionType(ManualRedactionType.RESIZE);
-
-            }
-
         });
 
     }
@@ -284,7 +222,7 @@ public class RedactionLogMergeService {
     }
 
 
-    public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
                                                        Map<String, List<Comment>> comments, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
@@ -295,11 +233,6 @@ public class RedactionLogMergeService {
                 RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
                 redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
                 redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
-                redactionLogEntry.setTextBefore(manualRedactionEntry.getTextBefore());
-                redactionLogEntry.setTextAfter(manualRedactionEntry.getTextAfter());
-
-                sectionTextService.handleSectionText(sectionGrid, redactionLogEntry);
-
                 redactionLogEntries.add(redactionLogEntry);
             }
         }
@@ -307,13 +240,9 @@ public class RedactionLogMergeService {
         return redactionLogEntries;
     }
 
-
-    private List<Rectangle> convertPositions(
-            List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
-
-        return positions.stream()
-                .map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos.getHeight(), pos.getPage()))
-                .collect(Collectors.toList());
+    private List<Rectangle> convertPositions(List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions){
+       return positions.stream().map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos
+                .getHeight(), pos.getPage())).collect(Collectors.toList());
     }
 
 
@@ -335,16 +264,15 @@ public class RedactionLogMergeService {
                 .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                 .legalBasis(manualRedactionEntry.getLegalBasis())
                 .value(manualRedactionEntry.getValue())
-                .section(manualRedactionEntry.getSection())
                 .type(manualRedactionEntry.getType())
                 .redacted(true)
                 .isHint(false)
+                .section(null)
                 .sectionNumber(-1)
                 .manual(true)
                 .status(manualRedactionEntry.getStatus())
                 .manualRedactionType(ManualRedactionType.ADD)
                 .manualRedactionUserId(manualRedactionEntry.getUser())
-                .rectangle(manualRedactionEntry.isRectangle())
                 .build();
     }
 
@@ -396,5 +324,6 @@ public class RedactionLogMergeService {
 
     }
 
+
 }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextService.java

@@ -1,39 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service
-public class SectionTextService {
-
-
-    public void handleSectionText(SectionGrid sectionGrid, RedactionLogEntry redactionLogEntry) {
-
-        if (redactionLogEntry.getSection() != null) {
-            // set by UI
-            return;
-        }
-
-        if (sectionGrid != null) {
-            var firstPosition = !redactionLogEntry.getPositions().isEmpty() ? redactionLogEntry.getPositions().iterator().next() : null;
-
-            if (firstPosition != null) {
-
-                for (var section : sectionGrid.getSections()) {
-                    if (section.getPages().contains(firstPosition.getPage())) {
-                        for (var sectionArea : section.getSectionAreas()) {
-                            if (sectionArea.contains(firstPosition)) {
-                                redactionLogEntry.setSection(section.getHeadline());
-                                redactionLogEntry.setSectionNumber(section.getSectionNumber());
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SurroundingWordsService.java

@@ -28,7 +28,7 @@ public class SurroundingWordsService {
         try {
             for (Entity entity : entities) {
 
-                if (dictionary != null && dictionary.isHint(entity.getType())) {
+                if (dictionary.isHint(entity.getType())) {
                     continue;
                 }
                 findSurroundingWords(entity, searchableText.toString(), entity.getStart(), entity.getEnd());
@@ -64,7 +64,7 @@ public class SurroundingWordsService {
                     String text = searchableString.substring(startOffset, endOffset);
                     for (Entity entity : entities) {
 
-                        if (dictionary != null && dictionary.isHint(entity.getType())) {
+                        if (dictionary.isHint(entity.getType())) {
                             continue;
                         }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java

@@ -1,17 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
@@ -22,6 +10,10 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 @Slf4j
 @UtilityClass
 @SuppressWarnings("PMD")
@@ -45,7 +37,8 @@ public class EntitySearchUtils {
                 startIndex = inputString.indexOf(cleanValue, stopIndex);
                 stopIndex = startIndex + cleanValue.length();
 
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
                     return true;
                 }
             } while (startIndex > -1);
@@ -73,7 +66,8 @@ public class EntitySearchUtils {
                 startIndex = inputString.indexOf(cleanValue, stopIndex);
                 stopIndex = startIndex + cleanValue.length();
 
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
                     found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine));
                 }
             } while (startIndex > -1);
@@ -104,7 +98,7 @@ public class EntitySearchUtils {
                     .collect(Collectors.toList());
             Entity firstEntity = orderedEntities.get(0);
             List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
-                    .trim(), dictionary == null ? true : dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
+                    .trim(), dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
 
             for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                 try {
@@ -127,7 +121,8 @@ public class EntitySearchUtils {
         for (Entity word : entities) {
             for (Entity inner : entities) {
                 if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
                     wordsToRemove.add(inner);
                 }
             }
@@ -146,16 +141,16 @@ public class EntitySearchUtils {
 
         if (entities.contains(found)) {
             Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if (!existingOptional.isPresent()) {
+            if(!existingOptional.isPresent()){
                 return;
             }
             var existing = existingOptional.get();
 
-            if (existing.getType().equals(found.getType())) {
-                existing.getEngines().addAll(found.getEngines());
-            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
+            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
                 entities.remove(found);
                 entities.add(found);
+            } else {
+                existing.getEngines().addAll(found.getEngines());
             }
         } else {
             entities.add(found);
@@ -170,14 +165,12 @@ public class EntitySearchUtils {
     }
 
 
-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
+    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded){
 
-        for (Entity toAdd : toBeAdded) {
+        for(Entity toAdd: toBeAdded){
             if (existing.contains(toAdd)) {
-                Optional<Entity> existingOptional = existing.stream()
-                        .filter(entity -> entity.equals(toAdd))
-                        .findFirst();
-                if (!existingOptional.isPresent()) {
+                Optional<Entity> existingOptional  = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
+                if(!existingOptional.isPresent()){
                     return;
                 }
                 var existingEntity = existingOptional.get();
@@ -188,40 +181,4 @@ public class EntitySearchUtils {
         }
     }
 
-
-    public Set<Entity> findNonOverlappingMatchEntities(Set<Entity> existingEntities, Set<Entity> foundEntities) {
-
-        Set<Entity> result = new HashSet<>();
-        if (existingEntities != null && foundEntities != null) {
-            for (Entity foundEntity : foundEntities) {
-
-                if (!overlaps(existingEntities, foundEntity)) {
-                    result.add(foundEntity);
-                }
-
-            }
-        }
-        return result;
-    }
-
-
-    private boolean overlaps(Set<Entity> existingEntities, Entity found) {
-
-        for (Entity existing : existingEntities) {
-
-            if(existing.getStart().equals(found.getStart())){
-                continue;
-            }
-
-            for (int i = existing.getStart(); i <= existing.getEnd(); i++) {
-                for (int j = found.getStart(); j <= found.getEnd(); j++) {
-                    if (i == j) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/Patterns.java

@@ -11,7 +11,8 @@ public class Patterns {
 
     public static Map<String, Pattern> patternCache = new HashMap<>();
 
-    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2}\\.){1,3})|(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2} ){1,3})");
+    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2}\\.)+|((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2} )+");
+
 
     public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageMergeService.java

@@ -0,0 +1,165 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageMergeService {
+
+
+    public List<PdfImage> mergeImages(List<PdfImage> images, int rotation){
+
+        List<PdfImage> mergedList = processImages(images, rotation);
+
+        List<PdfImage> imagesInImage = new ArrayList<>();
+        for(PdfImage image: mergedList){
+            for (PdfImage inner: mergedList){
+                if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
+                    imagesInImage.add(inner);
+                }
+            }
+        }
+        mergedList.removeAll(imagesInImage);
+
+        return mergedList;
+    }
+
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList, int rotation) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList, rotation);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2, int rotation) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double width2 = image2.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), rotation == 90 ? width + width2: width, rotation == 90 ? height1 : height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage(), image1.isHasTransparency() || image2.isHasTransparency());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
+    }
+
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList, int rotation) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i), rotation));
+            }
+        }
+        return candidatesList;
+    }
+
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2, int rotation) {
+        double x1 = rotation == 90 ? image1.getPosition().getY() : image1.getPosition().getX();
+        double y1 = rotation == 90 ? image1.getPosition().getX() : image1.getPosition().getY();
+        double width1 = rotation == 90 ? image1.getPosition().getHeight() : image1.getPosition().getWidth();
+        double x2 = rotation == 90 ? image2.getPosition().getY() : image2.getPosition().getX();
+        double y2 = rotation == 90 ? image2.getPosition().getX() : image2.getPosition().getY();
+        double width2 = rotation == 90 ? image2.getPosition().getHeight() : image2.getPosition().getWidth();
+        double height2 = rotation == 90 ? image2.getPosition().getWidth() : image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(rotation == 90 ? y2 - y1 : y1 - y2) && width2 > (height2 / 6);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageService.java

@@ -1,61 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.segmentation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.model.image.ImageServiceResponse;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-
-@Service
-@RequiredArgsConstructor
-public class ImageService {
-
-    private final ObjectMapper objectMapper;
-    private final RedactionStorageService redactionStorageService;
-
-    @SneakyThrows
-    public Map<Integer, List<PdfImage>> convertImages(String dossierId, String fileId){
-
-        var imageClassificationStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMAGE_INFO));
-        ImageServiceResponse imageServiceResponse = objectMapper.readValue(imageClassificationStream, ImageServiceResponse.class);
-
-        Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getImageMetadata().stream().forEach(imageMetadata -> {
-            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)) : ImageType.OTHER;
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification, imageMetadata.getPosition().getPageNumber()));
-        });
-
-        return images;
-    }
-
-
-    public void findOcr(Page page){
-        page.getImages().forEach(image -> {
-            if (image.getImageType().equals(ImageType.OTHER)) {
-                page.getTextBlocks().forEach(textblock -> {
-                    if (image.getPosition()
-                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
-                        image.setImageType(ImageType.OCR);
-                    }
-                });
-            }
-        });
-    }
-
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java

@@ -10,7 +10,6 @@ import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
@@ -30,6 +29,7 @@ import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
 import com.iqser.red.service.redaction.v1.server.parsing.PDFLinesTextStripper;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
@@ -50,10 +50,17 @@ public class PdfSegmentationService {
     private final BlockificationService blockificationService;
     private final ClassificationService classificationService;
     private final SectionsBuilderService sectionsBuilderService;
-    private final ImageService imageService;
+    private final ImageClassificationService imageClassificationService;
+    private final ImageMergeService imageMergeService;
 
 
-    public Document parseDocument(InputStream documentInputStream, Map<Integer, List<PdfImage>> pdfImages) throws IOException {
+    public Document parseDocument(InputStream documentInputStream) throws IOException {
+
+        return parseDocument(documentInputStream, false);
+    }
+
+
+    public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
 
         PDDocument pdDocument = null;
         try {
@@ -115,14 +122,15 @@ public class PdfSegmentationService {
                     page.setLandscape(isLandscape || isRotated);
                     page.setPageNumber(pageNumber);
 
+                    List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
+                    page.setImages(mergedList);
 
                     tableExtractionService.extractTables(cleanRulings, page);
                     buildPageStatistics(page);
                     increaseDocumentStatistics(page, document);
 
-                    if (pdfImages != null && pdfImages.containsKey(pageNumber)) {
-                        page.setImages(pdfImages.get(pageNumber));
-                        imageService.findOcr(page);
+                    if (!ignoreImages) {
+                        imageClassificationService.classifyImages(page);
                     }
 
                     pages.add(page);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java

@@ -211,11 +211,7 @@ public class SectionsBuilderService {
                 if (previous != null && previous.getText().startsWith("Table ")) {
                     table.setHeadline(previous.getText());
                 } else {
-                    if(lastHeadline == null || lastHeadline.isEmpty()) {
-                        table.setHeadline("Text in table");
-                    } else {
-                        table.setHeadline("Table in: " + lastHeadline);
-                    }
+                    table.setHeadline("Table in: " + lastHeadline);
                 }
 
                 if (textBlock != null && !alreadyAdded) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java

@@ -1,25 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.storage;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 @Slf4j
 @Service
@@ -29,17 +26,14 @@ public class RedactionStorageService {
     private final ObjectMapper objectMapper;
     private final StorageService storageService;
 
-
     @SneakyThrows
     public InputStream getStoredObject(String storageId) {
-
         return storageService.getObject(storageId).getInputStream();
     }
 
 
     @SneakyThrows
     public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
-
         storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
     }
 
@@ -98,13 +92,12 @@ public class RedactionStorageService {
     }
 
 
+
     public SectionGrid getSectionGrid(String dossierId, String fileId) {
 
+        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
         try {
-            var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
             return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
-        } catch (StorageObjectDoesNotExist e) {
-            throw new NotFoundException("Section Grid is not available.");
         } catch (IOException e) {
             throw new RuntimeException("Could not convert RedactionLog", e);
         }
@@ -123,12 +116,8 @@ public class RedactionStorageService {
     public static class StorageIdUtils {
 
         public static String getStorageId(String dossierId, String fileId, FileType fileType) {
-
             return dossierId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
         }
 
-
-
     }
-
 }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -1,29 +1,31 @@
 package com.iqser.red.service.redaction.v1.server;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
+import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
+import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -47,48 +49,15 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.FileAttribute;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
+import java.io.*;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
-import lombok.SneakyThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -136,15 +105,15 @@ public class RedactionIntegrationTest {
     @MockBean
     private DictionaryClient dictionaryClient;
 
+    @MockBean
+    private ImageClassificationClient imageClassificationClient;
+
     @Autowired
     private RedactionStorageService redactionStorageService;
 
     @Autowired
     private StorageService storageService;
 
-    @Autowired
-    private ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
-
     @MockBean
     private AmazonS3 amazonS3;
 
@@ -232,26 +201,42 @@ public class RedactionIntegrationTest {
                 .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
                 .build()));
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
         when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(PURITY, false));
         when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMAGE, false));
         when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(OCR, false));
         when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID))
+                .thenReturn(getDictionaryResponse(FORMULA, false));
         when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
         when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
     }
@@ -515,7 +500,8 @@ public class RedactionIntegrationTest {
         return Type.builder()
                 .id(type + ":" + TEST_DOSSIER_TEMPLATE_ID)
                 .hexColor(typeColorMap.get(type))
-                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
+                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
+                        .get(type)))
                 .isHint(hintTypeMap.get(type))
                 .isCaseInsensitive(caseInSensitiveMap.get(type))
                 .isRecommendation(recommendationTypeMap.get(type))
@@ -531,8 +517,7 @@ public class RedactionIntegrationTest {
             dictionaryEntries.add(DictionaryEntry.builder()
                     .value(entry)
                     .version(reanlysisVersions.getOrDefault(entry, 0L))
-                    .deleted(deleted.contains(entry))
-                    .build());
+                    .deleted(deleted.contains(entry)).build());
         });
         return dictionaryEntries;
     }
@@ -591,7 +576,7 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated3.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated3.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
         long rstart = System.currentTimeMillis();
@@ -607,76 +592,6 @@ public class RedactionIntegrationTest {
     }
 
 
-    @Test
-    public void redactionExpansionOverlap() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/ExpansionTest.pdf");
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        var values = redactionLog.getRedactionLogEntry()
-                .stream()
-                .map(RedactionLogEntry::getValue)
-                .collect(Collectors.toList());
-
-        assertThat(values).containsExactlyInAnyOrder("Lastname M.", "Doe", "Doe J.", "M. Mustermann", "Mustermann M.", "F. Lastname");
-    }
-
-
-    @Test
-    @SneakyThrows
-    public void testIgnoreHint() {
-
-        System.out.println("testIgnoreHint");
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/new/test-ignore-hint.pdf");
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        analyzeService.analyze(request);
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        var toRemove = IdRemoval.builder()
-                .annotationId("c630599611e6e3db314518374bcf70f7")
-                .status(AnnotationStatus.APPROVED)
-                .user("test")
-                .removeFromDictionary(false)
-                .processedDate(OffsetDateTime.now())
-                .requestDate(OffsetDateTime.now())
-                .build();
-
-        var manualRedactions = ManualRedactions.builder().idsToRemove(Set.of(toRemove)).build();
-        request.setManualRedactions(manualRedactions);
-        analyzeService.reanalyze(request);
-
-        var mergedRedactionLog = redactionController.getRedactionLog(RedactionRequest.builder()
-                .manualRedactions(manualRedactions)
-                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        var cbiAddressBeforeHintRemoval = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(re -> re.getType().equalsIgnoreCase("CBI_Address"))
-                .findAny()
-                .get();
-        assertThat(cbiAddressBeforeHintRemoval.isRedacted()).isFalse();
-
-        var cbiAddressAfterHintRemoval = mergedRedactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(re -> re.getType().equalsIgnoreCase("CBI_Address"))
-                .findAny()
-                .get();
-        assertThat(cbiAddressAfterHintRemoval.isRedacted()).isTrue();
-    }
-
-
     @Test
     @Ignore
     public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
@@ -730,176 +645,29 @@ public class RedactionIntegrationTest {
     }
 
 
-    @Test
-    public void redactionTestSeparatedRedaction() throws IOException {
+    private List<File> getPathsRecursively(File path) {
 
-        String fileName = "scanned/VV-380943_page38.pdf";
-        String outputFileName = OsUtils.getTemporaryDirectory() + "/AnnotatedRedactionTestSeparatedRedaction.pdf";
-
-        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-        request.setExcludedPages(Set.of(1));
-
-        request.setFileAttributes(List.of(FileAttribute.builder()
-                .id("fileAttributeId")
-                .label("Vertebrate Study")
-                .placeholder("{fileattributes.vertebrateStudy}")
-                .value("true")
-                .build()));
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-        var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        long end = System.currentTimeMillis();
-
-        System.out.println("first analysis duration: " + (end - start));
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Test.json")) {
-            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
+        List<File> result = new ArrayList<>();
+        if (path == null || path.listFiles() == null) {
+            return result;
         }
-
-        int correctFound = 0;
-        loop:
-        for (RedactionLogEntry redactionLogEntry : redactionLog.getRedactionLogEntry()) {
-            for (SectionText sectionText : text.getSectionTexts()) {
-                if (redactionLogEntry.isImage()) {
-                    correctFound++;
-                    continue loop;
-                }
-                if (redactionLogEntry.getSectionNumber() == sectionText.getSectionNumber()) {
-                    String value = sectionText.getText()
-                            .substring(redactionLogEntry.getStartOffset(), redactionLogEntry.getEndOffset());
-                    if (redactionLogEntry.getValue().equalsIgnoreCase(value)) {
-                        correctFound++;
-                    } else {
-                        throw new RuntimeException("WTF");
-                    }
-                }
+        for (File f : path.listFiles()) {
+            if (f.isFile()) {
+                result.add(f);
+            } else {
+                result.addAll(getPathsRecursively(f));
             }
         }
-        assertThat(correctFound).isEqualTo(redactionLog.getRedactionLogEntry().size());
+        return result;
 
-        dictionary.get(AUTHOR).add("properties");
-        reanlysisVersions.put("properties", 1L);
-
-        dictionary.get(AUTHOR).add("physical");
-        reanlysisVersions.put("physical", 2L);
-
-        deleted.add("David Chubb");
-        deleted.add("mouse");
-
-        dictionary.get(FALSE_POSITIVE).add("David Chubb");
-        reanlysisVersions.put("David Chubb", 3L);
-
-        reanlysisVersions.put("mouse", 3L);
-
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-
-        start = System.currentTimeMillis();
-
-        ManualRedactions manualRedactions = new ManualRedactions();
-
-        manualRedactions.setImageRecategorization(Set.of(ManualImageRecategorization.builder()
-                .annotationId("37eee3e9d589a5cc529bfec38c3ba479")
-                .fileId("fileId")
-                .status(AnnotationStatus.APPROVED)
-                .type("signature")
-                .build()));
-
-        request.setManualRedactions(manualRedactions);
-
-        AnalyzeResult reanalyzeResult = analyzeService.reanalyze(request);
-
-        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        end = System.currentTimeMillis();
-        System.out.println("reanalysis analysis duration: " + (end - start));
-
-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-
-        deleted.remove("mouse");
-        reanlysisVersions.put("mouse", 4L);
-
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-
-        analyzeService.reanalyze(request);
-
-        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        System.out.println("Output file:" + outputFileName);
     }
 
-    @Test
-    public void testChangeComputation() throws IOException {
-
-        String fileName = "files/new/test1S1T1.pdf";
-        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
-
-        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        analyzeService.analyze(request);
-
-        dictionary.get(AUTHOR).add("report");
-        reanlysisVersions.put("report", 2L);
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(2L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR +":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        analyzeService.reanalyze(request);
-
-        dictionary.get(AUTHOR).add("assessment report");
-        reanlysisVersions.put("assessment report", 3L);
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR +":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        analyzeService.reanalyze(request);
-
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR +":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        analyzeService.reanalyze(request);
-
-        var  redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        var changes = redactionLog.getRedactionLogEntry().stream().filter(entry ->
-                entry.getValue() != null && entry.getValue().equals("report"))
-                .findFirst().get().getChanges();
-
-        assertThat(changes.size()).isEqualTo(2);
-
-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-    }
 
     @Test
     public void redactionTest() throws IOException {
 
-        String fileName = "files/new/Single Study - Oral (Gavage) Mouse.pdf";
-        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
-
         long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
+        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
         request.setExcludedPages(Set.of(1));
 
@@ -920,7 +688,7 @@ public class RedactionIntegrationTest {
 
         System.out.println("first analysis duration: " + (end - start));
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Test.json")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Test.json")) {
             fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
         }
 
@@ -961,9 +729,11 @@ public class RedactionIntegrationTest {
 
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
 
         start = System.currentTimeMillis();
 
@@ -990,22 +760,24 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
 
+
         deleted.remove("mouse");
         reanlysisVersions.put("mouse", 4L);
 
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
         analyzeService.reanalyze(request);
 
         redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
-        System.out.println("Output file:" + outputFileName);
+        System.out.println("hi");
     }
 
 
@@ -1024,7 +796,7 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
         long end = System.currentTimeMillis();
@@ -1075,19 +847,21 @@ public class RedactionIntegrationTest {
         manualRedactionEntry.setType("name");
         manualRedactionEntry.setValue("O'Loughlin C.K.");
         manualRedactionEntry.setReason("Manual Redaction");
-        manualRedactionEntry.setPositions(List.of(Rectangle.builder()
-                .topLeftX(375.61096f)
-                .topLeftY(241.282f)
-                .width(7.648041f)
-                .height(43.72262f)
-                .page(1)
-                .build(), Rectangle.builder()
-                .topLeftX(384.83517f)
-                .topLeftY(241.282f)
-                .width(7.648041f)
-                .height(17.043358f)
-                .page(1)
-                .build()));
+        manualRedactionEntry.setPositions(List.of(Rectangle
+                        .builder()
+                        .topLeftX(375.61096f)
+                        .topLeftY(241.282f)
+                        .width(7.648041f)
+                        .height(43.72262f)
+                        .page(1).build()
+                , Rectangle
+                        .builder()
+                        .topLeftX(384.83517f)
+                        .topLeftY(241.282f)
+                        .width(7.648041f)
+                        .height(17.043358f)
+                        .page(1).build())
+        );
 
 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
 
@@ -1118,7 +892,7 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
         long end = System.currentTimeMillis();
@@ -1132,7 +906,7 @@ public class RedactionIntegrationTest {
     public void classificationTest() throws IOException {
 
         System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
 
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
@@ -1144,7 +918,7 @@ public class RedactionIntegrationTest {
 
         RedactionResult result = redactionController.classify(redactionRequest);
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Classified.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Classified.pdf")) {
             fileOutputStream.write(result.getDocument());
         }
     }
@@ -1154,7 +928,7 @@ public class RedactionIntegrationTest {
     public void sectionsTest() throws IOException {
 
         System.out.println("sectionsTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
 
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
@@ -1166,7 +940,7 @@ public class RedactionIntegrationTest {
 
         RedactionResult result = redactionController.sections(redactionRequest);
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Sections.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Sections.pdf")) {
             fileOutputStream.write(result.getDocument());
         }
     }
@@ -1176,7 +950,7 @@ public class RedactionIntegrationTest {
     public void htmlTablesTest() throws IOException {
 
         System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
 
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
@@ -1188,7 +962,7 @@ public class RedactionIntegrationTest {
 
         RedactionResult result = redactionController.htmlTables(redactionRequest);
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
             fileOutputStream.write(result.getDocument());
         }
     }
@@ -1210,7 +984,7 @@ public class RedactionIntegrationTest {
 
         RedactionResult result = redactionController.htmlTables(redactionRequest);
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
             fileOutputStream.write(result.getDocument());
         }
     }
@@ -1280,7 +1054,7 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
         long end = System.currentTimeMillis();
@@ -1290,241 +1064,6 @@ public class RedactionIntegrationTest {
     }
 
 
-    @Test
-    public void resizeRedactionTest() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
-
-        ManualRedactions manualRedactions = new ManualRedactions();
-
-        String manualAddId = UUID.randomUUID().toString();
-
-        Comment comment = Comment.builder()
-                .date(OffsetDateTime.now())
-                .user("TEST_USER")
-                .text("This is a comment test")
-                .build();
-        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
-                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
-                .fileId("fileId")
-                .status(AnnotationStatus.DECLINED)
-                .processedDate(OffsetDateTime.now())
-                .requestDate(OffsetDateTime.now())
-                .build()));
-        manualRedactions.setForceRedactions(Set.of(ManualForceRedaction.builder()
-                .annotationId("675eba69b0c2917de55462c817adaa05")
-                .fileId("fileId")
-                .legalBasis("Something")
-                .status(AnnotationStatus.APPROVED)
-                .requestDate(OffsetDateTime.now())
-                .processedDate(OffsetDateTime.now())
-                .build()));
-
-        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
-        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
-        manualRedactions.getComments().put(manualAddId, List.of(comment));
-
-        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
-        manualRedactionEntry.setAnnotationId(manualAddId);
-        manualRedactionEntry.setFileId("fileId");
-        manualRedactionEntry.setStatus(AnnotationStatus.APPROVED);
-        manualRedactionEntry.setType("CBI_author");
-        manualRedactionEntry.setValue("O'Loughlin C.K.");
-        manualRedactionEntry.setReason("Manual Redaction");
-        manualRedactionEntry.setProcessedDate(OffsetDateTime.now());
-        manualRedactionEntry.setRequestDate(OffsetDateTime.now());
-        manualRedactionEntry.setPositions(List.of(Rectangle.builder()
-                .topLeftX(375.61096f)
-                .topLeftY(241.282f)
-                .width(7.648041f)
-                .height(43.72262f)
-                .page(1)
-                .build(), Rectangle.builder()
-                .topLeftX(384.83517f)
-                .topLeftY(241.282f)
-                .width(7.648041f)
-                .height(17.043358f)
-                .page(1)
-                .build()));
-
-//        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
-
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-        request.setManualRedactions(manualRedactions);
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
-        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
-                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
-                .fileId("fileId")
-                .status(AnnotationStatus.APPROVED)
-                .requestDate(OffsetDateTime.now())
-                .processedDate(OffsetDateTime.now())
-                .build()));
-        manualRedactions.setLegalBasisChanges((Set.of(ManualLegalBasisChange.builder()
-                .annotationId("675eba69b0c2917de55462c817adaa05")
-                .fileId("fileId")
-                .legalBasis("Manual Legal Basis Change")
-                .status(AnnotationStatus.APPROVED)
-                .processedDate(OffsetDateTime.now())
-                .requestDate(OffsetDateTime.now())
-                .build())));
-        manualRedactions.setResizeRedactions(Set.of(ManualResizeRedaction.builder()
-                .annotationId("fc287b74be2421156ab2895c7474ccdd")
-                .fileId("fileId")
-                .processedDate(OffsetDateTime.now())
-                .requestDate(OffsetDateTime.now())
-                .value("Syngenta Crop Protection AG, Basel, Switzerland RCC Ltd., Itingen, Switzerland")
-                .positions(List.of(Rectangle.builder()
-                        .topLeftX(289.44595f)
-                        .topLeftY(327.567f)
-                        .width(7.648041f)
-                        .height(82.51475f)
-                        .page(1)
-                        .build(), Rectangle.builder()
-                        .topLeftX(298.67056f)
-                        .topLeftY(327.567f)
-                        .width(7.648041f)
-                        .height(75.32377f)
-                        .page(1)
-                        .build(), Rectangle.builder()
-                        .topLeftX(307.89517f)
-                        .topLeftY(327.567f)
-                        .width(7.648041f)
-                        .height(61.670967f)
-                        .page(1)
-                        .build(), Rectangle.builder()
-                        .topLeftX(316.99985f)
-                        .topLeftY(327.567f)
-                        .width(7.648041f)
-                        .height(38.104286f)
-                        .page(1)
-                        .build()))
-                .status(AnnotationStatus.APPROVED)
-                .build()));
-
-        analyzeService.reanalyze(request);
-
-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                .manualRedactions(manualRedactions)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-
-    }
-
-
-    @Test
-    public void testExpandByRegEx() throws IOException {
-
-        System.out.println("expandByRegex");
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-        long end = System.currentTimeMillis();
-
-        System.out.println("duration: " + (end - start));
-        System.out.println("numberOfPages: " + result.getNumberOfPages());
-    }
-
-
-    @Test
-    public void testManualSurroundingText() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/new/S4.pdf");
-
-        ManualRedactions manualRedactions = new ManualRedactions();
-
-        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
-        manualRedactionEntry.setAnnotationId(UUID.randomUUID().toString());
-        manualRedactionEntry.setFileId("fileId");
-        manualRedactionEntry.setStatus(AnnotationStatus.APPROVED);
-        manualRedactionEntry.setType("CBI_author");
-        manualRedactionEntry.setValue("rabbits");
-        manualRedactionEntry.setReason("Manual Redaction");
-        manualRedactionEntry.setPositions(List.of(Rectangle.builder()
-                .topLeftX(70.944f)
-                .topLeftY(670.1595f)
-                .width(30.07296f)
-                .height(10.048125f)
-                .page(1)
-                .build()));
-
-        ManualRedactionEntry manualRedactionEntry2 = new ManualRedactionEntry();
-        manualRedactionEntry2.setAnnotationId(UUID.randomUUID().toString());
-        manualRedactionEntry2.setFileId("fileId");
-        manualRedactionEntry2.setStatus(AnnotationStatus.APPROVED);
-        manualRedactionEntry2.setType("CBI_author");
-        manualRedactionEntry2.setValue("rabbits");
-        manualRedactionEntry2.setReason("Manual Redaction");
-        manualRedactionEntry2.setPositions(List.of(Rectangle.builder()
-                .topLeftX(470.5204f)
-                .topLeftY(746.1195f)
-                .width(29.96256f)
-                .height(10.048125f)
-                .page(1)
-                .build()));
-
-        ManualRedactionEntry manualRedactionEntry3 = new ManualRedactionEntry();
-        manualRedactionEntry3.setAnnotationId(UUID.randomUUID().toString());
-        manualRedactionEntry3.setFileId("fileId");
-        manualRedactionEntry3.setStatus(AnnotationStatus.APPROVED);
-        manualRedactionEntry3.setType("CBI_author");
-        manualRedactionEntry3.setValue("AOEL");
-        manualRedactionEntry3.setReason("Manual Redaction");
-        manualRedactionEntry3.setPositions(List.of(Rectangle.builder()
-                .topLeftX(355.53775f)
-                .topLeftY(266.1895f)
-                .width(29.32224f)
-                .height(10.048125f)
-                .page(1)
-                .build()));
-
-        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
-        manualRedactions.getEntriesToAdd().add(manualRedactionEntry2);
-        manualRedactions.getEntriesToAdd().add(manualRedactionEntry3);
-
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-        request.setManualRedactions(manualRedactions);
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                .fileId(TEST_FILE_ID)
-                .manualRedactions(manualRedactions)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-
-        var surroundingTextResult = manualRedactionSurroundingTextService.addSurroundingText(TEST_DOSSIER_ID, TEST_FILE_ID, manualRedactions);
-        surroundingTextResult.getEntriesToAdd().forEach(addEntry -> {
-            assertThat(addEntry.getTextAfter()).isNotEmpty();
-        });
-
-    }
-
-
     private static String loadFromClassPath(String path) {
 
         URL resource = ResourceLoader.class.getClassLoader().getResource(path);
@@ -1543,22 +1082,12 @@ public class RedactionIntegrationTest {
         }
     }
 
-
-    private List<File> getPathsRecursively(File path) {
-
-        List<File> result = new ArrayList<>();
-        if (path == null || path.listFiles() == null) {
-            return result;
+    private static String getTemporaryDirectory() {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
         }
-        for (File f : path.listFiles()) {
-            if (f.isFile()) {
-                result.add(f);
-            } else {
-                result.addAll(getPathsRecursively(f));
-            }
-        }
-        return result;
-
+        return "/tmp";
     }
 
-}
+}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java

@@ -27,162 +27,4 @@ public class EntitySearchUtilsTest {
 
     }
 
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result).contains(foundEntities1);
-        assertThat(result).contains(foundEntities2);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEndOverlapping() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedExistingAndExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(0);
-
-    }
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEndLong() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(0);
-
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/OsUtils.java

@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class OsUtils {
-
-    public static boolean isWindows() {
-
-        return StringUtils.containsIgnoreCase(System.getProperty("os.name"), "Windows");
-    }
-
-
-    public static String getTemporaryDirectory() {
-
-        String tmpdir = System.getProperty("java.io.tmpdir");
-        if (isWindows() && StringUtils.isNotBlank(tmpdir)) {
-            return tmpdir;
-        }
-        return "/tmp";
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java

@@ -1,16 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.redaction.v1.server.Application;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.model.image.ImageServiceResponse;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
@@ -35,18 +31,12 @@ import javax.imageio.ImageIO;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 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 static com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils.getTemporaryDirectory;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import lombok.SneakyThrows;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -77,29 +67,42 @@ public class PdfSegmentationServiceTest {
     @MockBean
     private LegalBasisClient legalBasisClient;
 
-    @Autowired
-    private ObjectMapper objectMapper;
-
     @Configuration
     @EnableAutoConfiguration(exclude = { RabbitAutoConfiguration.class})
     public static class TestConfiguration {
 
     }
 
+    @Test
+    public void testMergeImages() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/270Rotated.pdf");
+
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        assertThat(document.getPages().get(0).getImages().size()).isEqualTo(1);
+        assertThat(document.getPages().get(1).getImages().size()).isEqualTo(0);
+
+    }
 
     @Test
-    @SneakyThrows
-    public void testMapping(){
-        ClassPathResource responseJson = new ClassPathResource("files/image_response.json");
-        ImageServiceResponse imageServiceResponse = objectMapper.readValue(responseJson.getInputStream(), ImageServiceResponse.class);
+    @Ignore
+    public void testExtractImages() throws IOException {
 
-        Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getImageMetadata().stream().forEach(imageMetadata -> {
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)), imageMetadata.getPosition().getPageNumber()));
-        });
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
 
-        System.out.println("object");
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        int i = 0;
+        for (Page page : document.getPages()) {
+            for (PdfImage image : page.getImages()) {
+                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                    ImageIO.write(image.getImage(), "png", baos);
+                    try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Image " + i + ".png")) {
+                        fileOutputStream.write(baos.toByteArray());
+                    }
+                }
+                i++;
+            }
+        }
     }
 
 
@@ -108,7 +111,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Spanning Cells.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -129,7 +132,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -167,7 +170,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Multi Page Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -205,7 +208,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Rotated Table Headers.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -237,5 +240,12 @@ public class PdfSegmentationServiceTest {
                         .equals(firstTableHeaderCells))).isTrue();
     }
 
+    private static String getTemporaryDirectory() {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
+        }
+        return "/tmp";
+    }
 
 }

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_address.txt

@@ -1,8 +1,3 @@
-A & L Laboratories, 3505 Conestoga Drive, Fort Wayne, IN 46806-4413, Indiana, USA
-Jealotts Hill Research Station, Bracknell
-Jealott s Hill Research Station, Bracknell
-Western Research Center, 120
-Fort Wayne, IN 46806-4413, Indiana
 Abandoned vineyard, Northern Italy
 ABC Analytical Bio-Chemistry Lab. Inc.
 ABC Analytical Bio-Chemistry Lab. Inc., Columbia, USA
@@ -1638,7 +1633,6 @@ XenoTech, LLC, 16825 West 116th Street, Lenexa, KS, USA
 Zeneca Ag Products
 Zeneca Ag Products, Richmond, USA
 Zeneca Agrochemicals
-ZENECA Agrochemicals
 Zeneca Agrochemicals, Fernhurst, United Kingdom
 Zeneca Agrochemicals, Jealott’s Hill Research Station, Bracknell, Berkshire, UK
 Zeneca Agrochemical s, Jealott’s Hill, United Kingdom
@@ -1660,4 +1654,3 @@ Zyma SA
 Zyma SA, Nyon, Switzerland
 Mambo-Tox Ltd. Biomedical Sciences Building Bassett Crescent East Southampton SO16 7PX UK
 Syngenta Environmental Sciences Jealott’s Hill International Research Centre Bracknell, Berkshire RG42 6EY UK
-Test Ignored Hint CBI_ADDRESS

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_author.txt

@@ -1,33 +1,3 @@
-Foo
-F. Bar
-B. Foo
-Johnson R |
-Weissler M S and Butters C A
-AD Hurt
-N Pengelly
-HA J Napper
-E M Roper
-Earl M
-Weissler M S
-Warrinton J S
-Kuet SF
-Hadeld ST
-Butters C A
-Hurt AD
-Campbell AJ
-Runnalls JK
-Tummon O J
-Chapman PF
-Snell RJ
-MclIndoe EC
-Johnson R I
-Richard Andrews
-James Paul
-Walter Richard Andrews
-Wilbur H. Palmer
-Jeff Mueller
-James McDonelI
-Jeffrey S. Heither
 1 Braid S.and Tsui G
 1 Schwader A.L.
 2 Lee MR
@@ -8615,9 +8585,4 @@ Zoriki Hosomi R.
 Zoriki Hosomi Rosana
 Zuberer D
 Zubrod J
-Zwicker R.E.
-Doe
-M. Mustermann
-F. Lastname
-Mustermann
-Lastname
+Zwicker R.E.

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/PII.txt

@@ -1,5 +0,0 @@
-Amendment 1
-Report Number: 33168
-Page
-Report Number: BFI0714
-Tesh Consultants International

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/published_information.txt

@@ -85,4 +85,3 @@ Toxicology and Applied Pharmacology
 Toxicol Sci
 Toxicol Sci.
 Toxicol Sci. 1
-Test Ignored Hint Published Information

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/allAuthors.drl

@@ -7,20 +7,12 @@ global Section section
 
 // --------------------------------------- CBI rules -------------------------------------------------------------------
 
-//rule "0: Expand CBI Authors with firstname initials"
-//    when
-//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-//    then
-//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//    end
-
 rule "0: Expand CBI Authors with firstname initials"
     when
         Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
     then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
     end
 
 

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl

@@ -7,20 +7,12 @@ global Section section
 
 // --------------------------------------- CBI rules -------------------------------------------------------------------
 
-//rule "0: Expand CBI Authors with firstname initials"
-//    when
-//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-//    then
-//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//    end
-
 rule "0: Expand CBI Authors with firstname initials"
     when
         Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
     then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
     end
 
 
@@ -344,11 +336,4 @@ rule "29: Redact Dossier Redactions"
          Section(matchesType("dossier_redactions"))
      then
          section.redact("dossier_redactions", 29, "Dossier Redaction found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-     end
-
-rule "30: Ignore dossier_redactions if confidential"
-    when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Confidentiality","confidential") && matchesType("dossier_redactions"));
-    then
-        section.ignore("dossier_redactions");
-    end
+     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/files/image_response.json

@@ -1,686 +0,0 @@
-{
-  "dossierId": "f889853e-4bf8-49a9-aae5-c38605c6ef40",
-  "fileId": "22ef63e29bb2a27db8497272336f6b32",
-  "imageMetadata": [
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 1.0,
-          "signature": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 89.88,
-        "x2": 274.20000000000005,
-        "y1": 716.24,
-        "y2": 770.0,
-        "pageNumber": 1
-      },
-      "geometry": {
-        "width": 184.32000000000005,
-        "height": 53.75999999999999
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.14298074612038092,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 3.42857142857143,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999968,
-          "logo": 1.6e-05,
-          "other": 1.6e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 3
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0000782051152328,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999872,
-          "other": 7.9e-05,
-          "logo": 4.8e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 7
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0000782051152328,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.996366,
-          "other": 0.00,
-          "logo": 2.3e-05,
-          "formula": 4e-06
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 8
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0002630764355351,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999772,
-          "logo": 0.000131,
-          "other": 9.7e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 82.59443842482001,
-        "x2": 512.6365568843402,
-        "y1": 116.943736387567,
-        "y2": 725.0718450317352,
-        "pageNumber": 73
-      },
-      "geometry": {
-        "width": 430.04211845952017,
-        "height": 608.1281086441682
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.72236755521117,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7071571143427432,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 1.0,
-          "logo": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 328.20483600000006,
-        "x2": 393.94460940000005,
-        "y1": 175.1643178,
-        "y2": 203.92865619999998,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 65.73977339999999,
-        "height": 28.764338399999986
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.06142518774572455,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 2.2854609929078022,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 1.0,
-          "logo": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 136.5955818,
-        "x2": 224.72461859999999,
-        "y1": 175.1133172,
-        "y2": 203.97965680000001,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 88.1290368,
-        "height": 28.866339600000003
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.07124601312700823,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 3.053003533568904,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 1.0,
-          "signature": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 194.99126880000003,
-        "x2": 399.80967840000005,
-        "y1": 554.6597824,
-        "y2": 686.2413304,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 204.81840960000002,
-        "height": 131.581548
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.23189275858788796,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.5565891472868219,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.9945512,
-        "x2": 242.52382799999998,
-        "y1": 411.24609519999996,
-        "y2": 523.2434128,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 108.52927679999999,
-        "height": 111.99731760000003
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15573364968831904,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9690346083788703,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.5865464,
-        "x2": 242.3198256,
-        "y1": 274.972492,
-        "y2": 387.7858192,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 108.7332792,
-        "height": 112.8133272
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15644678522591335,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9638336347197106,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 246.19587120000003,
-        "x2": 356.5611696,
-        "y1": 400.84197279999995,
-        "y2": 519.3673672,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 110.3652984,
-        "height": 118.52539440000004
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.1615575178049721,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9311531841652321,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 244.9718568,
-        "x2": 358.3971912,
-        "y1": 274.972492,
-        "y2": 387.7858192,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 113.4253344,
-        "height": 112.8133272
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15978662903260646,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.0054249547920433,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 254.9679744,
-        "x2": 371.6573472,
-        "y1": 439.6024288,
-        "y2": 564.0438928,
-        "pageNumber": 91
-      },
-      "geometry": {
-        "width": 116.6893728,
-        "height": 124.441464
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.17021718544102565,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9377049180327869,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.9945512,
-        "x2": 249.663912,
-        "y1": 443.07046959999997,
-        "y2": 687.2613424,
-        "pageNumber": 91
-      },
-      "geometry": {
-        "width": 115.66936080000002,
-        "height": 244.19087280000002
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.23739910530627284,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.4736842105263158,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 105.84222,
-        "x2": 374.870385,
-        "y1": 526.40545,
-        "y2": 687.05734,
-        "pageNumber": 92
-      },
-      "geometry": {
-        "width": 269.028165,
-        "height": 160.65188999999998
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.2936614851112628,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.6746031746031749,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 0.788068,
-          "other": 0.152259,
-          "formula": 0.036883,
-          "signature": 0.02279
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 44.64999049990001,
-        "x2": 550.5759424999001,
-        "y1": 63.286004150029996,
-        "y2": 778.72242095003,
-        "pageNumber": 94
-      },
-      "geometry": {
-        "width": 505.92595200000005,
-        "height": 715.4364168000001
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.8498341845521462,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7071571143427431,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.998335,
-          "logo": 0.000955,
-          "other": 0.000703,
-          "formula": 7e-06
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 58.954005540029996,
-        "x2": 536.45979618003,
-        "y1": 83.94401504006001,
-        "y2": 758.05854296006,
-        "pageNumber": 95
-      },
-      "geometry": {
-        "width": 477.50579064000004,
-        "height": 674.11452792
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.8014221863697041,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7083452007974936,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    }
-  ]
-}