Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

REd-106: rebase auf master

Browse Source
This commit is contained in:
cheng 2020-07-20 10:13:35 +02:00
parent 141e4b9371
commit 9c14f331fd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
View File

@ -27,7 +27,7 @@ public class DictionaryService {
private long dictionaryVersion = -1; private long dictionaryVersion = -1;
@Getter @Getter
private Map<String, Set<String>> dictionaryEntry = new HashMap<>(); private Map<String, Set<String>> dictionary = new HashMap<>();
@Getter @Getter
private Map<String, float[]> entryColors = new HashMap<>(); private Map<String, float[]> entryColors = new HashMap<>();
@ -48,7 +48,7 @@ public class DictionaryService {
return; return;
} else { } else {
entryColors = typeResponse.getTypes().stream().collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor)); 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) { } catch (FeignException e) {
log.warn("Got some unknown feignException", e); log.warn("Got some unknown feignException", e);

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
View File

@ -104,7 +104,7 @@ public class EntityRedactionService {
String normalizedInputString = searchableText.toString(); String normalizedInputString = searchableText.toString();
Set<Entity> found = new HashSet<>(); 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()) { for (String value : entry.getValue()) {
int startIndex; int startIndex;
int stopIndex = 0; int stopIndex = 0;

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
View File

@ -173,7 +173,7 @@ public class AnnotationHighlightService {
if (!entity.isRedaction()) { if (!entity.isRedaction()) {
return false; return false;
} }
return dictionaryService.getDictionaryEntry().keySet().contains(entity.getType()); return dictionaryService.getDictionary().keySet().contains(entity.getType());
} }
private float[] getColor(Entity entity) { private float[] getColor(Entity entity) {