Fixed annotating cell with more than one TextBlock (Mismatch between EntityPositionSequence and found Entity)

Merge in RED/redaction-service from 2columnTables to master

* commit '599c7bd6e474b61c32f92d6c67e53a80de13a2e7':
  Tables with only 2 column are treated as on text

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

@@ -212,7 +212,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 maxCharWidths = charWidth;
             }
 
-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
                 startIndex++;
                 continue;
             }
@@ -220,15 +220,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             // Strange but sometimes this is happening, for example: Metolachlor2.pdf
             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(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
             }
 
-            if (i > 0 && textPositions.get(i).getUnicode().equals(" ") && i <= textPositions.size() - 2) {
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0")) && i <= textPositions.size() - 2) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i + 1;
@@ -236,14 +236,13 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         }
 
         List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && sublist.get(sublist.size() - 1).getUnicode().equals(" ")) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().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(" "))) {
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
             textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
         }
         super.writeString(text);
-
     }
 
     @Override

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

@@ -2,18 +2,20 @@ 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.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.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.PositionUtil;
 
 import lombok.Builder;
 import lombok.Data;
@@ -45,6 +47,10 @@ public class Section {
 
     private Map<String, CellValue> tabularData;
 
+    private Dictionary dictionary;
+
+    private SearchableText searchableText;
+
 
     public boolean rowEquals(String headerName, String value) {
 
@@ -243,7 +249,7 @@ public class Section {
             }
         } while (startIndex > -1);
 
-        return removeEntitiesContainedInLarger(found);
+        return PositionUtil.clearAndFindPositions(found, searchableText, dictionary);
     }
 
 
@@ -253,22 +259,6 @@ public class Section {
     }
 
 
-    public Set<Entity> removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        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) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-        return entities;
-    }
-
-
     public void highlightCell(String cellHeader, int ruleNumber, String type) {
 
         annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
@@ -305,15 +295,21 @@ public class Section {
             entity.setMatchedRule(ruleNumber);
             entity.setRedactionReason(reason);
             entity.setTargetSequences(value.getTextBlocks()
-                    .get(0)
-                    .getSequences()); // Make sure no other cells with same content are highlighted
+                    .stream()
+                    .map(TextBlock::getSequences)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
             entity.setLegalBasis(legalBasis);
 
+            Set<Entity> singleEntitySet = new HashSet<>();
+            singleEntitySet.add(entity);
+            PositionUtil.clearAndFindPositions(singleEntitySet, searchableText, dictionary);
+
             // HashSet keeps the older value, but we want the new only.
             entities.remove(entity);
             entities.add(entity);
 
-            entities = removeEntitiesContainedInLarger(entities);
+            PositionUtil.removeEntitiesContainedInLarger(entities);
 
             if (addAsRecommendations && !isLocal()) {
                 String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";

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

@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -28,6 +29,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionS
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.PositionUtil;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 
@@ -69,7 +71,7 @@ public class EntityRedactionService {
             documentEntities.removeAll(foundByLocal);
             documentEntities.addAll(foundByLocal);
 
-            removeEntitiesContainedInLarger(documentEntities);
+            PositionUtil.removeEntitiesContainedInLarger(documentEntities);
         }
 
         for (Entity entity : documentEntities) {
@@ -99,88 +101,27 @@ public class EntityRedactionService {
                                      boolean local, Map<Integer, Set<Entity>> hintsPerSectionNumber) {
 
         Set<Entity> documentEntities = new HashSet<>();
-        int sectionNumber = 1;
+
+        AtomicInteger sectionNumber = new AtomicInteger(1);
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
 
-            SearchableText searchableText = paragraph.getSearchableText();
-
             List<Table> tables = paragraph.getTables();
-
             for (Table table : tables) {
-                boolean singleCellTable = table.getRowCount() == 1 && table.getColCount() == 1;
-                for (List<Cell> row : table.getRows()) {
-                    SearchableText searchableRow = new SearchableText();
-                    Map<String, CellValue> tabularData = new HashMap<>();
-                    int start = 0;
-                    List<Integer> cellStarts = new ArrayList<>();
-                    for (Cell cell : row) {
-                        if (!singleCellTable && cell.isHeaderCell() || CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                            continue;
-                        }
-                        addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber);
-                        int cellStart = start;
-                        cell.getHeaderCells().forEach(headerCell -> {
-                            StringBuilder headerBuilder = new StringBuilder();
-                            headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                            String headerName = headerBuilder.toString()
-                                    .replaceAll("\n", "")
-                                    .replaceAll(" ", "")
-                                    .replaceAll("-", "");
-                            tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
-                        });
-
-                        for (TextBlock textBlock : cell.getTextBlocks()) {
-                            // TODO avoid cell overlap merging.
-                            searchableRow.addAll(textBlock.getSequences());
-                        }
-                        cellStarts.add(cellStart);
-                        start = start + cell.toString().trim().length() + 1;
-                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, dictionary
-                            .getDictionaryModels(), local);
-                    surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
-
-                    sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                            .isLocal(local)
-                            .dictionaryTypes(dictionary.getTypes())
-                            .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
-                                    .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
-                                    .collect(Collectors.toSet()) : rowEntities)
-                            .text(searchableRow.getAsStringWithLinebreaks())
-                            .searchText(searchableRow.toString())
-                            .headline(table.getHeadline())
-                            .sectionNumber(sectionNumber)
-                            .tabularData(tabularData)
-                            .build(), searchableRow));
-
-                    sectionNumber++;
+                if (table.getColCount() == 2) {
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                } else {
+                    sectionSearchableTextPairs.addAll(processTablePerRow(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                 }
-                sectionNumber++;
+                sectionNumber.incrementAndGet();
             }
-
-            addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);
-            surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
-
-            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                    .isLocal(local)
-                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
-                            .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
-                            .collect(Collectors.toSet()) : entities)
-                    .text(searchableText.getAsStringWithLinebreaks())
-                    .searchText(searchableText.toString())
-                    .headline(paragraph.getHeadline())
-                    .sectionNumber(sectionNumber)
-                    .build(), searchableText));
-
-            sectionNumber++;
+            sectionSearchableTextPairs.add(processText(paragraph, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
         }
 
         sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
             Section analysedRowSection = droolsExecutionService.executeRules(sectionSearchableTextPair.getSection());
-            documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), sectionSearchableTextPair.getSearchableText(), dictionary));
+            documentEntities.addAll(analysedRowSection.getEntities());
 
             analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
                 if (dictionary.isRecommendation(key)) {
@@ -211,23 +152,130 @@ public class EntityRedactionService {
     }
 
 
-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+    private List<SectionSearchableTextPair> processTablePerRow(Table table, ManualRedactions manualRedactions,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary, boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
 
-        removeEntitiesContainedInLarger(entities);
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (List<Cell> row : table.getRows()) {
+            SearchableText searchableRow = new SearchableText();
+            Map<String, CellValue> tabularData = new HashMap<>();
+            int start = 0;
+            List<Integer> cellStarts = new ArrayList<>();
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
+                int cellStart = start;
+                cell.getHeaderCells().forEach(headerCell -> {
+                    StringBuilder headerBuilder = new StringBuilder();
+                    headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                    String headerName = headerBuilder.toString()
+                            .replaceAll("\n", "")
+                            .replaceAll(" ", "")
+                            .replaceAll("-", "");
+                    tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                });
 
-        for (Entity entity : entities) {
-            if (entity.getPositionSequences().isEmpty()) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
-                        .getType()), entity.getTargetSequences()));
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    // TODO avoid cell overlap merging.
+                    searchableRow.addAll(textBlock.getSequences());
+                }
+                cellStarts.add(cellStart);
+                start = start + cell.toString().trim().length() + 1;
+            }
+            Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
+            surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(local)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                            .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                            .collect(Collectors.toSet()) : rowEntities)
+                    .text(searchableRow.getAsStringWithLinebreaks())
+                    .searchText(searchableRow.toString())
+                    .headline(table.getHeadline())
+                    .sectionNumber(sectionNumber.intValue())
+                    .tabularData(tabularData)
+                    .searchableText(searchableRow)
+                    .dictionary(dictionary)
+                    .build(), searchableRow));
+
+            sectionNumber.incrementAndGet();
+        }
+        return sectionSearchableTextPairs;
+    }
+
+
+    private List<SectionSearchableTextPair> processTableAsOneText(Table table, ManualRedactions manualRedactions,
+                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
+                                                                  boolean local,
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        SearchableText entireTableText = new SearchableText();
+        for (List<Cell> row : table.getRows()) {
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
             }
         }
 
-        return entities;
+        Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);
+
+        sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream.concat(rowEntities
+                        .stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                        .collect(Collectors.toSet()) : rowEntities)
+                .text(entireTableText.getAsStringWithLinebreaks())
+                .searchText(entireTableText.toString())
+                .headline(table.getHeadline())
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(entireTableText)
+                .dictionary(dictionary)
+                .build(), entireTableText));
+
+        return sectionSearchableTextPairs;
+    }
+
+
+    private SectionSearchableTextPair processText(Paragraph paragraph, ManualRedactions manualRedactions,
+                                                  AtomicInteger sectionNumber, Dictionary dictionary, boolean local,
+                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        SearchableText searchableText = paragraph.getSearchableText();
+        addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber.intValue());
+        Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
+
+        return new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream.concat(entities
+                        .stream(), hintsPerSectionNumber.get(sectionNumber).stream())
+                        .collect(Collectors.toSet()) : entities)
+                .text(searchableText.getAsStringWithLinebreaks())
+                .searchText(searchableText.toString())
+                .headline(paragraph.getHeadline())
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(searchableText)
+                .dictionary(dictionary)
+                .build(), searchableText);
     }
 
 
     private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                     List<DictionaryModel> dictionary, boolean local) {
+                                     Dictionary dictionary, boolean local) {
 
         Set<Entity> found = new HashSet<>();
         String searchableString = searchableText.toString();
@@ -236,15 +284,15 @@ public class EntityRedactionService {
         }
 
         String lowercaseInputString = searchableString.toLowerCase();
-        for (DictionaryModel model : dictionary) {
+        for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
                 found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
             } else {
                 found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
             }
         }
-        removeEntitiesContainedInLarger(found);
-        return found;
+
+        return PositionUtil.clearAndFindPositions(found, searchableText, dictionary);
 
     }
 
@@ -282,22 +330,6 @@ public class EntityRedactionService {
     }
 
 
-    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        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()) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-    }
-
-
     private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
                                               String section, int sectionNumber) {
 

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

@@ -1,17 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
 
 @Slf4j
 @Service
@@ -94,7 +92,7 @@ public class SurroundingWordsService {
             int numberOfWordsBefore = wordsBefore.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
                     .getNumberOfSurroundingWords() : wordsBefore.length;
             if (wordsBefore.length > 0) {
-                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore));
+                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore, textBefore.endsWith(" ")));
             }
         }
 
@@ -106,13 +104,13 @@ public class SurroundingWordsService {
             int numberOfWordsAfter = wordsAfter.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
                     .getNumberOfSurroundingWords() : wordsAfter.length;
             if (wordsAfter.length > 0) {
-                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter));
+                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter, textAfter.startsWith(" ")));
             }
         }
     }
 
 
-    private String concatWordsBefore(String[] words, int number) {
+    private String concatWordsBefore(String[] words, int number, boolean endWithSpace) {
 
         StringBuilder sb = new StringBuilder();
 
@@ -122,11 +120,12 @@ public class SurroundingWordsService {
             sb.append(words[i]).append(" ");
         }
 
-        return sb.toString().trim();
+        String result = sb.toString().trim();
+        return endWithSpace ? result + " " : result;
     }
 
 
-    private String concatWordsAfter(String[] words, int number) {
+    private String concatWordsAfter(String[] words, int number, boolean startWithSpace) {
 
         StringBuilder sb = new StringBuilder();
 
@@ -134,7 +133,8 @@ public class SurroundingWordsService {
             sb.append(words[i]).append(" ");
         }
 
-        return sb.toString().trim();
+        String result = sb.toString().trim();
+        return startWithSpace ? " " + result : result;
     }
 
 }

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

@@ -0,0 +1,72 @@
+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.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+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.model.SearchableText;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@UtilityClass
+public class PositionUtil {
+
+    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+
+        Map<String, List<Entity>> entitiesByWord = new HashMap<>();
+
+        for (Entity entity : entities) {
+            entitiesByWord.computeIfAbsent(entity.getWord(), (x) -> new ArrayList<>()).add(entity);
+        }
+
+        for (String word : entitiesByWord.keySet()) {
+
+            List<Entity> orderedEntities = entitiesByWord.get(word)
+                    .stream()
+                    .sorted(Comparator.comparing(Entity::getStart))
+                    .collect(Collectors.toList());
+            Entity firstEntity = orderedEntities.get(0);
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord(), dictionary.isCaseInsensitiveDictionary(firstEntity
+                    .getType()), firstEntity.getTargetSequences());
+
+            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
+                try {
+                    orderedEntities.get(i).setPositionSequences(List.of(positionSequences.get(i)));
+                } catch (Exception e){
+                    log.warn("Mismatch between EntityPositionSequence and found Entity!");
+                }
+            }
+        }
+
+        removeEntitiesContainedInLarger(entities);
+
+        return entities;
+    }
+
+
+    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
+
+        List<Entity> wordsToRemove = new ArrayList<>();
+        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()) {
+                    wordsToRemove.add(inner);
+                }
+            }
+        }
+        entities.removeAll(wordsToRemove);
+    }
+
+
+}

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

@@ -48,6 +48,7 @@ import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.PositionUtil;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 
@@ -108,7 +109,7 @@ public class EntityRedactionServiceTest {
         Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
         entities.add(nested);
         entities.add(nesting);
-        entityRedactionService.removeEntitiesContainedInLarger(entities);
+        PositionUtil.removeEntitiesContainedInLarger(entities);
 
         assertThat(entities.size()).isEqualTo(1);
         assertThat(entities).contains(nesting);