diff --git a/src/main/java/cz/cvut/kbss/analysis/config/conf/AnnotatorConf.java b/src/main/java/cz/cvut/kbss/analysis/config/conf/AnnotatorConf.java index 01f748c6..27cef8a7 100644 --- a/src/main/java/cz/cvut/kbss/analysis/config/conf/AnnotatorConf.java +++ b/src/main/java/cz/cvut/kbss/analysis/config/conf/AnnotatorConf.java @@ -14,4 +14,5 @@ public class AnnotatorConf { private String listDocumentsAPI; private String convertDocumentAPI; + private String processAnnotationAPI; } diff --git a/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java b/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java index 2fe2fba8..dbb2e6ec 100755 --- a/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java +++ b/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java @@ -105,6 +105,7 @@ public void deleteComponent(@PathVariable(name = "systemFragment") String system public void importDocument(@PathVariable(name = "systemFragment") String systemFragment, @RequestParam URI documentId) throws UnsupportedEncodingException { URI systemURI = identifierService.composeIdentifier(Vocabulary.s_c_system, systemFragment); log.info("> importing annotations from document <{}> into system <{}>", documentId, systemURI); + annotatorService.processAnnotations(); annotatorService.convertDocument(documentId.toString()); repositoryService.importDocument(systemURI, documentId); } diff --git a/src/main/java/cz/cvut/kbss/analysis/service/external/AnnotatorService.java b/src/main/java/cz/cvut/kbss/analysis/service/external/AnnotatorService.java index 6f07334c..8930ad19 100644 --- a/src/main/java/cz/cvut/kbss/analysis/service/external/AnnotatorService.java +++ b/src/main/java/cz/cvut/kbss/analysis/service/external/AnnotatorService.java @@ -11,8 +11,6 @@ import java.io.StringReader; import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; @Service @Slf4j @@ -51,4 +49,16 @@ public void convertDocument(String docuementIri) throws UnsupportedEncodingExcep // use document iri as the context in which to store converted annotations rdfDao.persist(reader, docuementIri); } + + public void processAnnotations(){ + try { + log.info("calling external annotation processing service {}", conf.getProcessAnnotationAPI()); + RestTemplate restTemplate = new RestTemplate(); + String url = conf.getProcessAnnotationAPI(); + ResponseEntity response + = restTemplate.getForEntity(url, String.class); + }catch (Exception e){ + log.warn("Failed executing external process annotation service at <{}>. Error message - {}", e.getMessage()); + } + } } \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index de5fb2f4..b7760b4f 100755 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -25,3 +25,4 @@ logging: annotator: list-documents-api: ${LIST_DOCUMENT_API:http://localhost:8282/s-pipes/service?_pId=list-documents} convert-document-api: ${CONVERT_DOCUMENT_API:http://localhost:8282/s-pipes/service?_pId=convert-document} + process-annotatoins-api: ${PROCESS_ANNOTATION_API:https://localhost:8090/annotator/process-annotation-service.sh} \ No newline at end of file