From 9c14f331fd3d71ae247262e884ed81b5ca5d3455 Mon Sep 17 00:00:00 2001
From: cheng <cheng.zhu@iqser.com>
Date: Mon, 20 Jul 2020 10:13:35 +0200
Subject: [PATCH] REd-106: rebase auf master

---
 .../v1/server/redaction/service/DictionaryService.java        | 4 ++--
 .../v1/server/redaction/service/EntityRedactionService.java   | 2 +-
 .../visualization/service/AnnotationHighlightService.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
index a31ddbee..ab0a9a97 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
@@ -27,7 +27,7 @@ public class DictionaryService {
     private long dictionaryVersion = -1;
 
     @Getter
-    private Map<String, Set<String>> dictionaryEntry = new HashMap<>();
+    private Map<String, Set<String>> dictionary = new HashMap<>();
 
     @Getter
     private Map<String, float[]> entryColors = new HashMap<>();
@@ -48,7 +48,7 @@ public class DictionaryService {
                 return;
             } else {
                 entryColors = typeResponse.getTypes().stream().collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
-                dictionaryEntry = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, s -> dictionaryClient.getDictionaryForType(s).getEntries().stream().collect(Collectors.toSet())));
+                dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, s -> dictionaryClient.getDictionaryForType(s).getEntries().stream().collect(Collectors.toSet())));
             }
         } catch (FeignException e) {
             log.warn("Got some unknown feignException", e);
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 80b3a320..2514e6f8 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
@@ -104,7 +104,7 @@ public class EntityRedactionService {
         String normalizedInputString = searchableText.toString();
 
         Set<Entity> found = new HashSet<>();
-        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionaryEntry().entrySet()) {
+        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionary().entrySet()) {
             for (String value : entry.getValue()) {
                 int startIndex;
                 int stopIndex = 0;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
index ee1da831..f678603b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
@@ -173,7 +173,7 @@ public class AnnotationHighlightService {
         if (!entity.isRedaction()) {
             return false;
         }
-        return dictionaryService.getDictionaryEntry().keySet().contains(entity.getType());
+        return dictionaryService.getDictionary().keySet().contains(entity.getType());
     }
 
     private float[] getColor(Entity entity) {