From 272c7cc2287b146664b8bb277c3731262ac78a19 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Mon, 24 Aug 2020 15:39:50 +0200
Subject: [PATCH] Remove '-' in headernames

---
 .../redaction/v1/server/redaction/model/Section.java        | 6 ++++--
 .../v1/server/redaction/service/EntityRedactionService.java | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
index 3f4b841c..3a517ef2 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
@@ -37,7 +37,8 @@ public class Section {
 
     public boolean rowEquals(String headerName, String value){
         String cleanHeaderName = headerName.replaceAll("\n", "")
-                .replaceAll(" ", "");
+                .replaceAll(" ", "")
+                .replaceAll("-", "");
 
         return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).getText().equals(value);
     }
@@ -173,7 +174,8 @@ public class Section {
     public void highlightCell(String cellHeader, int ruleNumber, String type) {
 
         String cleanHeaderName = cellHeader.replaceAll("\n", "")
-                .replaceAll(" ", "");
+                .replaceAll(" ", "")
+                .replaceAll("-", "");
 
         TextBlock value = tabularData.get(cleanHeaderName);
         if (value == null) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
index b301d600..b00a59b8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
@@ -65,7 +65,8 @@ public class EntityRedactionService {
                             headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
                             String headerName = headerBuilder.toString()
                                     .replaceAll("\n", "")
-                                    .replaceAll(" ", "");
+                                    .replaceAll(" ", "")
+                                    .replaceAll("-", "");
                             tabularData.put(headerName, cell.getTextBlocks().get(0));
                         });
                         for (TextBlock textBlock : cell.getTextBlocks()) {