From 5ca2e5af23b45aa82d78c84290b083e39c279377 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 3 Mar 2023 12:45:06 +0200 Subject: [PATCH] RED-6182 - version bump --- .../redaction-service-api-v1/pom.xml | 2 +- .../client/EntityRecognitionClient.java | 16 -------------- .../model/EntityRecognitionRequest.java | 18 ---------------- .../client/model/EntityRecognitionResult.java | 21 ------------------- .../src/main/resources/application-dev.yaml | 10 +++++++-- .../realdata/LiveDataIntegrationTest.java | 4 ---- 6 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/EntityRecognitionClient.java delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionRequest.java delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionResult.java diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml index 08cba8b4..1dece7ae 100644 --- a/redaction-service-v1/redaction-service-api-v1/pom.xml +++ b/redaction-service-v1/redaction-service-api-v1/pom.xml @@ -12,7 +12,7 @@ redaction-service-api-v1 - 2.0.3 + 2.0.8 diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/EntityRecognitionClient.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/EntityRecognitionClient.java deleted file mode 100644 index df29fc94..00000000 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/EntityRecognitionClient.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iqser.red.service.redaction.v1.server.client; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PostMapping; - -import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest; -import com.iqser.red.service.redaction.v1.server.client.model.NerEntities; - -@FeignClient(name = "EntityRecognitionClient", url = "${entity-recognition-service.url}") -public interface EntityRecognitionClient { - - @PostMapping(value = "/find_authors", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - NerEntities findAuthors(EntityRecognitionRequest entityRecognitionRequest); - -} diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionRequest.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionRequest.java deleted file mode 100644 index f1196b4a..00000000 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.iqser.red.service.redaction.v1.server.client.model; - -import java.util.List; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class EntityRecognitionRequest { - - private List data; - -} diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionResult.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionResult.java deleted file mode 100644 index abe0af13..00000000 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionResult.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.iqser.red.service.redaction.v1.server.client.model; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class EntityRecognitionResult { - - @Builder.Default - private Map> entities = new HashMap<>(); - -} diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml b/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml index 2d266963..789bcf1f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml @@ -1,11 +1,17 @@ server: port: 8083 -configuration-service.url: "http://localhost:8081" -file-management-service.url: "http://localhost:8085" +persistence-service.url: "http://localhost:8085" storage: bucket-name: 'redaction' endpoint: 'http://localhost:9000' key: minioadmin secret: minioadmin + + +redaction-service: + enableImageClassification: false + cvTableParsingEnabled: false + nerServiceEnabled: false + priorityMode: false diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java index b8684b80..3f049cf9 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java @@ -39,7 +39,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp import com.iqser.red.service.redaction.v1.server.Application; import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService; import com.iqser.red.service.redaction.v1.server.client.DictionaryClient; -import com.iqser.red.service.redaction.v1.server.client.EntityRecognitionClient; import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient; import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient; import com.iqser.red.service.redaction.v1.server.client.RulesClient; @@ -65,9 +64,6 @@ public class LiveDataIntegrationTest { @MockBean protected DictionaryClient dictionaryClient; - @MockBean - protected EntityRecognitionClient entityRecognitionClient; - @MockBean private FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;