diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml index f7d688f0..3829ce86 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.6 + 1.0.12 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 bff060b9..518a9071 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 @@ -41,6 +41,9 @@ public class DictionaryService { @Getter private List caseInsensitiveTypes = new ArrayList<>(); + @Getter + private float[] defaultColor; + public void updateDictionary() { @@ -71,6 +74,7 @@ public class DictionaryService { .map(TypeResult::getType) .collect(Collectors.toList()); dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, s -> convertEntries(s))); + defaultColor = dictionaryClient.getDefaultColor().getColor(); } } 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/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 fa4b49aa..0b7b8090 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 @@ -203,7 +203,7 @@ public class AnnotationHighlightService { } if (!dictionaryService.getEntryColors().containsKey(entity.getType())) { - return dictionaryService.getEntryColors().get("default"); + return dictionaryService.getDefaultColor(); } return dictionaryService.getEntryColors().get(entity.getType()); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index 8aff773a..400bf046 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -35,6 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.core.io.ClassPathResource; import org.springframework.test.context.junit4.SpringRunner; +import com.iqser.red.service.configuration.v1.api.model.DefaultColor; import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse; import com.iqser.red.service.configuration.v1.api.model.RulesResponse; import com.iqser.red.service.configuration.v1.api.model.TypeResponse; @@ -57,7 +58,6 @@ public class RedactionIntegrationTest { private static final String ADDRESS_CODE = "address"; private static final String NAME_CODE = "name"; private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator"; - private static final String DEFAULT = "default"; @Autowired private RedactionController redactionController; @@ -109,7 +109,7 @@ public class RedactionIntegrationTest { when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(getDictionaryResponse(ADDRESS_CODE)); when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(getDictionaryResponse(NAME_CODE)); when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR)); - when(dictionaryClient.getDictionaryForType(DEFAULT)).thenReturn(getDictionaryResponse(DEFAULT)); + when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor(new float[]{1f, 0.502f, 0f})); } @@ -135,7 +135,6 @@ public class RedactionIntegrationTest { .stream() .map(this::cleanDictionaryEntry) .collect(Collectors.toSet())); - dictionary.put(DEFAULT, new ArrayList<>()); } @@ -151,19 +150,16 @@ public class RedactionIntegrationTest { typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1}); typeColorMap.put(NAME_CODE, new float[]{1, 1, 0}); typeColorMap.put(NO_REDACTION_INDICATOR, new float[]{1, 0.502f, 0}); - typeColorMap.put(DEFAULT, new float[]{1, 0.502f, 0}); hintTypeMap.put(VERTEBRATES_CODE, true); hintTypeMap.put(ADDRESS_CODE, false); hintTypeMap.put(NAME_CODE, false); hintTypeMap.put(NO_REDACTION_INDICATOR, true); - hintTypeMap.put(DEFAULT, true); caseInSensitiveMap.put(VERTEBRATES_CODE, true); caseInSensitiveMap.put(ADDRESS_CODE, false); caseInSensitiveMap.put(NAME_CODE, false); caseInSensitiveMap.put(NO_REDACTION_INDICATOR, true); - caseInSensitiveMap.put(DEFAULT, true); }