From c276ebd951e0a96e8688975973a49d9aaa364cc2 Mon Sep 17 00:00:00 2001 From: cheng Date: Thu, 23 Jul 2020 10:48:37 +0200 Subject: [PATCH] RED-161: reverse caseSensitive --- .../redaction/service/DictionaryService.java | 27 ++++++++++++++++--- 1 file changed, 23 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 c21c5a53..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 @@ -40,6 +40,7 @@ public class DictionaryService { @Getter private List caseInsensitiveTypes = new ArrayList<>(); + public void updateDictionary() { long version = dictionaryClient.getVersion(); @@ -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()); - caseInsensitiveTypes = typeResponse.getTypes().stream().filter(TypeResult::isCaseInsensitive).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