From 01e7115d301d8706962390b76af0769eab67c1fe Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 9 May 2022 09:02:11 +0300 Subject: [PATCH] RED-3992 - Fixed PMD --- .../redaction/service/AnalyzeService.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java index f8a9b443..02f31165 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java @@ -114,14 +114,14 @@ public class AnalyzeService { return analyze(analyzeRequest); } - var dis = System.currentTimeMillis(); +// var dis = System.currentTimeMillis(); DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId()); - log.info("Dictionary Increment time time: {} ms", (System.currentTimeMillis() - dis)); +// log.info("Dictionary Increment time time: {} ms", (System.currentTimeMillis() - dis)); - var fis = System.currentTimeMillis(); +// var fis = System.currentTimeMillis(); Set sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse() .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest); - log.info("Find sections time: {} ms", (System.currentTimeMillis() - fis)); +// log.info("Find sections time: {} ms", (System.currentTimeMillis() - fis)); if (sectionsToReanalyse.isEmpty()) { return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true); @@ -139,33 +139,32 @@ public class AnalyzeService { .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber())) .collect(Collectors.toList()); - long kis = System.currentTimeMillis(); +// long kis = System.currentTimeMillis(); KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId()); - log.info("Kie time: {} ms", (System.currentTimeMillis() - kis)); +// log.info("Kie time: {} ms", (System.currentTimeMillis() - kis)); - long dds = System.currentTimeMillis(); +// long dds = System.currentTimeMillis(); Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId()); - log.info("Dict Time time: {} ms", (System.currentTimeMillis() - dds)); +// log.info("Dict Time time: {} ms", (System.currentTimeMillis() - dds)); - long pis = System.currentTimeMillis(); +// long pis = System.currentTimeMillis(); PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities); - log.info("Find Entities time: {}", (System.currentTimeMillis() - pis)); +// log.info("Find Entities time: {}", (System.currentTimeMillis() - pis)); - long crs = System.currentTimeMillis(); +// long crs = System.currentTimeMillis(); var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId()); - log.info("Create Redaction-log time: {} ms", (System.currentTimeMillis() - crs)); - long prs = System.currentTimeMillis(); +// log.info("Create Redaction-log time: {} ms", (System.currentTimeMillis() - crs)); +// long prs = System.currentTimeMillis(); var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false); - log.info("Process imports time: {} ms", (System.currentTimeMillis() - prs)); +// log.info("Process imports time: {} ms", (System.currentTimeMillis() - prs)); redactionLog.getRedactionLogEntry() .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()) && !entry.getType() .equals(IMPORTED_REDACTION_TYPE)); redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries); - var fls = System.currentTimeMillis(); - var x = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true); - log.info("Finalize time: {} ms", (System.currentTimeMillis() - fls)); - return x; +// var fls = System.currentTimeMillis(); + // log.info("Finalize time: {} ms", (System.currentTimeMillis() - fls)); + return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true); } @@ -218,7 +217,7 @@ public class AnalyzeService { } } - long ss = System.currentTimeMillis(); +// long ss = System.currentTimeMillis(); var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues().stream() .map(DictionaryIncrementValue::getValue).collect(Collectors.toList()), true); @@ -230,7 +229,7 @@ public class AnalyzeService { } } - log.info("Section Find time: {}", (System.currentTimeMillis() - ss)); +// log.info("Section Find time: {}", (System.currentTimeMillis() - ss)); log.info("Should reanalyze {} sections for request: {}, took: {}", sectionsToReanalyse.size(), analyzeRequest, System.currentTimeMillis() - start);