diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml index 1b656c6d..f7d688f0 100644 --- a/redaction-service-v1/redaction-service-server-v1/pom.xml +++ b/redaction-service-v1/redaction-service-server-v1/pom.xml @@ -39,7 +39,7 @@ com.iqser.red.service configuration-service-api-v1 - 1.0.5.1 + 1.0.6 org.drools 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 f96de814..4a02ad89 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 @@ -38,7 +38,8 @@ public class DictionaryService { private List hintTypes = new ArrayList<>(); @Getter - private List caseSensitiveTypes = new ArrayList<>(); + private List caseInsensitiveTypes = new ArrayList<>(); + public void updateDictionary() { @@ -49,18 +50,36 @@ public class DictionaryService { } } + private void updateDictionaryEntry() { + try { TypeResponse typeResponse = dictionaryClient.getAllTypes(); if (typeResponse != null && !CollectionUtils.isEmpty(typeResponse.getTypes())) { - entryColors = typeResponse.getTypes().stream().collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor)); - dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, s -> dictionaryClient.getDictionaryForType(s).getEntries().stream().collect(Collectors.toSet()))); - hintTypes = typeResponse.getTypes().stream().filter(TypeResult::isHint).map(TypeResult::getType).collect(Collectors.toList()); - caseSensitiveTypes = typeResponse.getTypes().stream().filter(TypeResult::isCaseSensitive).map(TypeResult::getType).collect(Collectors.toList()); + entryColors = typeResponse.getTypes() + .stream() + .collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor)); + dictionary = entryColors.keySet() + .stream() + .collect(Collectors.toMap(type -> type, s -> dictionaryClient.getDictionaryForType(s) + .getEntries() + .stream() + .collect(Collectors.toSet()))); + hintTypes = typeResponse.getTypes() + .stream() + .filter(TypeResult::isHint) + .map(TypeResult::getType) + .collect(Collectors.toList()); + caseInsensitiveTypes = typeResponse.getTypes() + .stream() + .filter(TypeResult::isCaseInsensitive) + .map(TypeResult::getType) + .collect(Collectors.toList()); } } catch (FeignException e) { log.warn("Got some unknown feignException", e); throw e; } } + } \ No newline at end of file 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 81cc166f..fa4b49aa 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 @@ -211,7 +211,7 @@ public class AnnotationHighlightService { private boolean isHint(Entity entity) { List hintTypes = dictionaryService.getHintTypes(); - if (!CollectionUtils.isEmpty(hintTypes) && hintTypes.contains(entity.getType())) { + if (CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType())) { return true; } return false;