diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index c63151be..821e20d6 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -11,6 +11,7 @@ import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClien import com.iqser.red.service.redaction.v1.server.client.RulesClient; import com.iqser.red.service.redaction.v1.server.controller.RedactionController; import com.iqser.red.service.redaction.v1.server.memory.MemoryStats; +import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService; import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader; import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities; import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService; @@ -83,6 +84,9 @@ public class RedactionIntegrationTest { @Autowired private RedactionController redactionController; + @Autowired + private ReanalyzeService reanalyzeService; + @Autowired private ObjectMapper objectMapper; @@ -464,7 +468,7 @@ public class RedactionIntegrationTest { public void test270Rotated() { AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf"); MemoryStats.printMemoryStats(); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); assertThat(result).isNotNull(); } @@ -474,7 +478,7 @@ public class RedactionIntegrationTest { public void testLargeScannedFileOOM() { AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf"); MemoryStats.printMemoryStats(); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); assertThat(result).isNotNull(); } @@ -496,7 +500,7 @@ public class RedactionIntegrationTest { AnalyzeRequest request = prepareStorage(new FileInputStream((path))); System.out.println("Redacting file : " + path.getName()); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); Map> duplicates = new HashMap<>(); @@ -514,7 +518,7 @@ public class RedactionIntegrationTest { when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(1L); long rstart = System.currentTimeMillis(); - redactionController.reanalyze(request); + reanalyzeService.reanalyze(request); long rend = System.currentTimeMillis(); System.out.println("reanalysis analysis duration: " + (rend - rstart)); @@ -553,7 +557,7 @@ public class RedactionIntegrationTest { ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf"); AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream()); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID); var text = redactionStorageService.getText(TEST_PROJECT_ID, TEST_FILE_ID); @@ -607,7 +611,7 @@ public class RedactionIntegrationTest { when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE)); start = System.currentTimeMillis(); - AnalyzeResult reanalyzeResult = redactionController.reanalyze(request); + AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request); end = System.currentTimeMillis(); System.out.println("reanalysis analysis duration: " + (end - start)); @@ -631,7 +635,7 @@ public class RedactionIntegrationTest { long start = System.currentTimeMillis(); AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf"); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder() .projectId(TEST_PROJECT_ID) @@ -693,7 +697,7 @@ public class RedactionIntegrationTest { AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream()); request.setManualRedactions(manualRedactions); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); manualRedactions.getEntriesToAdd().add(manualRedactionEntry); manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder() @@ -701,7 +705,7 @@ public class RedactionIntegrationTest { .status(Status.APPROVED) .build())); - redactionController.reanalyze(request); + reanalyzeService.reanalyze(request); AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder() @@ -816,7 +820,7 @@ public class RedactionIntegrationTest { AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream()); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID); @@ -863,7 +867,7 @@ public class RedactionIntegrationTest { AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream()); - AnalyzeResult result = redactionController.analyze(request); + AnalyzeResult result = reanalyzeService.analyze(request); AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder() .projectId(TEST_PROJECT_ID)