From 8de655d8848c05de3ce5d7a19ad0887d516bcb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 7 Sep 2021 10:36:11 +0200 Subject: [PATCH] RED-1970: Base64 encode text in communication with entity-recogintion-service --- .../v1/server/redaction/service/EntityRedactionService.java | 3 ++- .../v1/server/redaction/service/NerAnalyserService.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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 7a2f95f7..d57156bd 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 @@ -10,6 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.kie.api.runtime.KieContainer; import org.springframework.stereotype.Service; @@ -230,7 +231,7 @@ public class EntityRedactionService { if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities.getResult() .containsKey(sectionNumber)) { nerEntities.getResult().get(sectionNumber).forEach(res -> { - found.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false)); + found.add(new Entity(new String(Base64.decodeBase64(res.getValue().getBytes())), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false)); }); } } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/NerAnalyserService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/NerAnalyserService.java index df717214..b7611b0d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/NerAnalyserService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/NerAnalyserService.java @@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.redaction.service; import java.util.stream.Collectors; +import org.apache.commons.codec.binary.Base64; import org.springframework.stereotype.Service; import com.iqser.red.service.file.management.v1.api.model.FileType; @@ -33,8 +34,9 @@ public class NerAnalyserService { var nerRequest = EntityRecognitionRequest.builder() .data(text.getSectionTexts() .stream() - .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), sectionText - .getText())) + .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64 + .encodeBase64(sectionText + .getText().getBytes())))) .collect(Collectors.toList())) .build();