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

RED-3992 - Fixed PMD

Browse Source
This commit is contained in:
Timo Bejan 2022-05-09 09:02:11 +03:00
parent 747323f882
commit 01e7115d30
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java
View File

@ -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<Integer> 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);