Test old pattern

Pull request #248 : RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service
Merge in RED/redaction-service from RED-2263-rs1 to master * commit 'b96c39d5e58317e989faf8dc881ee6e596dbf363': RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service
2021-10-14 15:09:53 +02:00 · 2021-10-14 13:21:58 +02:00 · 2021-10-14 13:04:49 +02:00 · 2021-10-13 09:24:16 +02:00 · 2021-10-12 17:23:28 +03:00 · 2021-10-08 15:30:38 +02:00
2 changed files with 20 additions and 18 deletions
@@ -32,7 +32,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.6.0</version>
+                <version>1.7.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -1,19 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.stream.Collectors;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.client.EntityRecognitionClient;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionSection;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.stereotype.Service;
+
+import java.util.stream.Collectors;

@Slf4j
@Service
@@ -31,20 +29,24 @@ public class NerAnalyserService {

            long start = System.currentTimeMillis();

-            var nerRequest = EntityRecognitionRequest.builder()
-                    .data(text.getSectionTexts()
-                            .stream()
-                            .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64
-                                    .encodeBase64(sectionText
-                                    .getText().getBytes()))))
-                            .collect(Collectors.toList()))
-                    .build();
+            if (text != null) {
+                var nerRequest = EntityRecognitionRequest.builder()
+                        .data(text.getSectionTexts()
+                                .stream()
+                                .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64
+                                        .encodeBase64(sectionText
+                                                .getText().getBytes()))))
+                                .collect(Collectors.toList()))
+                        .build();

-            var nerResponse = entityRecognitionClient.findAuthors(nerRequest);
+                var nerResponse = entityRecognitionClient.findAuthors(nerRequest);

-            log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);
+                log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);

-            redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
+                redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
+            } else {
+                log.warn("Warning, text for file: {} in dossier: {} is null", fileId, dossierId);
+            }
        }
    }
Author	SHA1	Message	Date
Dominique Eifländer	21255e9854	Test old pattern	2021-10-14 15:09:53 +02:00
Ali Oezyetimoglu	d0cd3853cc	Pull request #248 : RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service Merge in RED/redaction-service from RED-2263-rs1 to master * commit 'b96c39d5e58317e989faf8dc881ee6e596dbf363': RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service	2021-10-14 13:21:58 +02:00
aoezyetimoglu	b96c39d5e5	RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service	2021-10-14 13:04:49 +02:00
Timo Bejan	b83baf4bc4	Pull request #247 : RED-2334 Merge in RED/redaction-service from 3.0-efsa-readiness to master * commit '8bfe8acb85e33502f4978b12b5cc09f68a602f47': RED-2334	2021-10-13 09:24:16 +02:00
Timo Bejan	8bfe8acb85	RED-2334	2021-10-12 17:23:28 +03:00
Ali Oezyetimoglu	57f6bd77ed	Pull request #246 : RED-2246: updated platform-commons-dependency Merge in RED/redaction-service from RED-2246-rs1 to master * commit '15ed333478313f3f23d439ad6163553f9b68760e': RED-2246: updated platform-commons-dependency	2021-10-08 15:30:38 +02:00
aoezyetimoglu	15ed333478	RED-2246: updated platform-commons-dependency	2021-10-08 15:18:48 +02:00