From 5c9094ad343993e1f06766be4ca8246b7f29f19a Mon Sep 17 00:00:00 2001 From: p-Heinze <46108992+p-Heinze@users.noreply.github.com> Date: Sun, 9 Aug 2020 14:17:23 +0200 Subject: [PATCH] inject application name --- .../AnnotationofSpotProperty.java | 2 +- .../DiambiguationClass.java | 2 +- .../DiambiguationProperty.java | 2 +- .../wdaqua/qanary/clsnliod/ClsNliodCls.java | 2 +- .../wdaqua/qanary/mypackage/BabelfyNED.java | 2 +- .../qanary/dandelionned/DandelionNED.java | 2 +- .../meaningcloudned/MeaningCloudNed.java | 2 +- .../wdaqua/qanary/ontotext/OntoTextNED.java | 2 +- .../java/eu/wdaqua/qanary/tagme/TagmeNED.java | 2 +- .../eu/wdaqua/qanary/aylien/AylienNER.java | 2 +- .../eu/wdaqua/qanary/mypackage/Babelfy.java | 2 +- .../qanary/dbpediaSpotlight/Application.java | 5 +- .../dbpediaSpotlight/DBpediaSpotlightNER.java | 51 ++++++++------- .../eu/wdaqua/qanary/dandelion/Dandelion.java | 2 +- .../EntityClassifier2/EntityClassifier2.java | 2 +- .../eu/wdaqua/qanary/FOX/Application.java | 5 +- .../eu/wdaqua/qanary/FOX/FOXComponent.java | 63 ++++++++++--------- .../wdaqua/qanary/ontotext/OntoTextNER.java | 33 ++++++---- .../eu/wdaqua/qanary/mypackage/TextRazor.java | 33 ++++++---- .../wdaqua/qanary/ambiverse/AmbiverseNER.java | 2 +- .../qanary/stanfordner/Application.java | 5 +- .../stanfordner/StanfordNERComponent.java | 9 ++- .../java/eu/wdaqua/qanary/tagme/TagmeNER.java | 33 ++++++---- .../qanary/LuceneLinker/Application.java | 5 +- .../qanary/LuceneLinker/LuceneLinker.java | 52 ++++++++------- ...cterAlterEgoSimpleDBpediaQueryBuilder.java | 43 +++++++------ ...QueryBuilderSimpleRealNameOfSuperHero.java | 2 +- 27 files changed, 215 insertions(+), 152 deletions(-) diff --git a/qa.qanary_component-AnnotationofSpotProperty-tgm/src/main/java/eu/wdaqua/qanary/annotationofspotproperty/AnnotationofSpotProperty.java b/qa.qanary_component-AnnotationofSpotProperty-tgm/src/main/java/eu/wdaqua/qanary/annotationofspotproperty/AnnotationofSpotProperty.java index 22109aa5a..7108fcbbe 100644 --- a/qa.qanary_component-AnnotationofSpotProperty-tgm/src/main/java/eu/wdaqua/qanary/annotationofspotproperty/AnnotationofSpotProperty.java +++ b/qa.qanary_component-AnnotationofSpotProperty-tgm/src/main/java/eu/wdaqua/qanary/annotationofspotproperty/AnnotationofSpotProperty.java @@ -203,7 +203,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + " ] ; " // + " oa:hasBody <" + urls + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qa.qanary_component-DiambiguationClass-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationclass/DiambiguationClass.java b/qa.qanary_component-DiambiguationClass-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationclass/DiambiguationClass.java index b24798b37..cb382fa16 100644 --- a/qa.qanary_component-DiambiguationClass-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationclass/DiambiguationClass.java +++ b/qa.qanary_component-DiambiguationClass-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationclass/DiambiguationClass.java @@ -290,7 +290,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) { + " oa:hasSource <" + uriQuestion + ">; " // + " ] . " // + " ?a oa:hasBody <" + urls + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " + "WHERE { "// + "BIND (IRI(str(RAND())) AS ?a) ." // diff --git a/qa.qanary_component-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationproperty/DiambiguationProperty.java b/qa.qanary_component-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationproperty/DiambiguationProperty.java index 04321fcf8..2dff05336 100644 --- a/qa.qanary_component-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationproperty/DiambiguationProperty.java +++ b/qa.qanary_component-DiambiguationProperty-OKBQA/src/main/java/eu/wdaqua/qanary/diambiguationproperty/DiambiguationProperty.java @@ -281,7 +281,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws SparqlQueryFa + " ?a a qa:AnnotationOfRelation . " + " ?a oa:hasTarget [ " + " a oa:SpecificResource; " // + " oa:hasSource <" + uriQuestion + ">; " + " ] . " // + " ?a oa:hasBody <" + urls + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:annotatedAt ?time " + "}} " // + "WHERE { " // diff --git a/qanary_component-CLS-CLSNLIOD/src/main/java/eu/wdaqua/qanary/clsnliod/ClsNliodCls.java b/qanary_component-CLS-CLSNLIOD/src/main/java/eu/wdaqua/qanary/clsnliod/ClsNliodCls.java index 0c1e46848..55c665b00 100644 --- a/qanary_component-CLS-CLSNLIOD/src/main/java/eu/wdaqua/qanary/clsnliod/ClsNliodCls.java +++ b/qanary_component-CLS-CLSNLIOD/src/main/java/eu/wdaqua/qanary/clsnliod/ClsNliodCls.java @@ -205,7 +205,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + " ] ; " // + " oa:hasBody <" + urls + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NED-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/BabelfyNED.java b/qanary_component-NED-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/BabelfyNED.java index badfe59c9..af881cec0 100644 --- a/qanary_component-NED-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/BabelfyNED.java +++ b/qanary_component-NED-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/BabelfyNED.java @@ -196,7 +196,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " ] " // + " ] . " // + " ?a oa:hasBody <" + l.link + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " + "}} " // + "WHERE { " // + " BIND (IRI(str(RAND())) AS ?a) ."// diff --git a/qanary_component-NED-Dandelion/src/main/java/eu/wdaqua/qanary/dandelionned/DandelionNED.java b/qanary_component-NED-Dandelion/src/main/java/eu/wdaqua/qanary/dandelionned/DandelionNED.java index 6af4db49d..c74649706 100644 --- a/qanary_component-NED-Dandelion/src/main/java/eu/wdaqua/qanary/dandelionned/DandelionNED.java +++ b/qanary_component-NED-Dandelion/src/main/java/eu/wdaqua/qanary/dandelionned/DandelionNED.java @@ -198,7 +198,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " ] " // + " ] . " // + " ?a oa:hasBody <" + l.link + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " + "}} " // + "WHERE { " // + " BIND (IRI(str(RAND())) AS ?a) ."// diff --git a/qanary_component-NED-MeaningCloud/src/main/java/eu/wdaqua/qanary/meaningcloudned/MeaningCloudNed.java b/qanary_component-NED-MeaningCloud/src/main/java/eu/wdaqua/qanary/meaningcloudned/MeaningCloudNed.java index f18621903..7934cf83e 100644 --- a/qanary_component-NED-MeaningCloud/src/main/java/eu/wdaqua/qanary/meaningcloudned/MeaningCloudNed.java +++ b/qanary_component-NED-MeaningCloud/src/main/java/eu/wdaqua/qanary/meaningcloudned/MeaningCloudNed.java @@ -218,7 +218,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " ] " // + " ] . " // + " ?a oa:hasBody <" + s.link + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " + "}} " // + "WHERE { " // + " BIND (IRI(str(RAND())) AS ?a) ."// diff --git a/qanary_component-NED-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNED.java b/qanary_component-NED-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNED.java index 767f712b0..38ff51931 100644 --- a/qanary_component-NED-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNED.java +++ b/qanary_component-NED-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNED.java @@ -203,7 +203,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " ] " // + " ] . " // + " ?a oa:hasBody <" + l.link + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " + "}} " // + "WHERE { " // + " BIND (IRI(str(RAND())) AS ?a) ."// diff --git a/qanary_component-NED-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNED.java b/qanary_component-NED-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNED.java index 637ce69fe..860a16d07 100644 --- a/qanary_component-NED-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNED.java +++ b/qanary_component-NED-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNED.java @@ -214,7 +214,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " ] " // + " ] . " // + " ?a oa:hasBody <" + l.link + "> ;" // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " + "}} " // + "WHERE { " // + " BIND (IRI(str(RAND())) AS ?a) ."// diff --git a/qanary_component-NER-Aylien/src/main/java/eu/wdaqua/qanary/aylien/AylienNER.java b/qanary_component-NER-Aylien/src/main/java/eu/wdaqua/qanary/aylien/AylienNER.java index 913ff08a3..fcfa7fc28 100644 --- a/qanary_component-NER-Aylien/src/main/java/eu/wdaqua/qanary/aylien/AylienNER.java +++ b/qanary_component-NER-Aylien/src/main/java/eu/wdaqua/qanary/aylien/AylienNER.java @@ -132,7 +132,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/Babelfy.java b/qanary_component-NER-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/Babelfy.java index 9f5c9b16a..4c41ac11c 100644 --- a/qanary_component-NER-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/Babelfy.java +++ b/qanary_component-NER-Babelfy/src/main/java/eu/wdaqua/qanary/mypackage/Babelfy.java @@ -128,7 +128,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/Application.java b/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/Application.java index 2f29d8f41..61a275f52 100644 --- a/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/Application.java +++ b/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/Application.java @@ -1,5 +1,6 @@ package eu.wdaqua.qanary.dbpediaSpotlight; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -20,8 +21,8 @@ public class Application { * QanaryServiceController in the qanary_component-template */ @Bean - public QanaryComponent qanaryComponent() { - return new DBpediaSpotlightNER(); + public QanaryComponent qanaryComponent(@Value("${spring.application.name}") final String applicationName) { + return new DBpediaSpotlightNER(applicationName); } public static void main(String[] args) { diff --git a/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/DBpediaSpotlightNER.java b/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/DBpediaSpotlightNER.java index 7a5ff1221..2187675d2 100644 --- a/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/DBpediaSpotlightNER.java +++ b/qanary_component-NER-DBpedia-Spotlight/src/main/java/eu/wdaqua/qanary/dbpediaSpotlight/DBpediaSpotlightNER.java @@ -10,8 +10,10 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.jena.vocabulary.DB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -33,6 +35,11 @@ public class DBpediaSpotlightNER extends QanaryComponent { private static final Logger logger = LoggerFactory.getLogger(DBpediaSpotlightNER.class); + private final String applicationName; + + public DBpediaSpotlightNER(@Value("${spring.application.name}") final String applicationName) { + this.applicationName = applicationName; + } /** * default processor of a QanaryMessage */ @@ -135,7 +142,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) { // STEP3: Pass the information to the component and execute it // logger.info("apply commons alignment on outgraph"); - DBpediaSpotlightNER qaw = new DBpediaSpotlightNER(); + DBpediaSpotlightNER qaw = new DBpediaSpotlightNER(applicationName); List stEn = new ArrayList(); stEn = qaw.getResults(myQuestion); @@ -152,27 +159,27 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) { //STEP4: Push the result of the component to the triplestore for (Selection s : selections) { - String sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " - + "INSERT { " - + "GRAPH <" + myQanaryQuestion.getOutGraph() + "> { " - + " ?a a qa:AnnotationOfSpotInstance . " - + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " - + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " - + " oa:hasSelector [ " - + " a oa:TextPositionSelector ; " - + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " - + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " - + " ] " - + " ] ; " - + " oa:annotatedBy ; " - + " oa:AnnotatedAt ?time " - + "}} " - + "WHERE { " - + "BIND (IRI(str(RAND())) AS ?a) ." - + "BIND (now() as ?time) " + String sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + myQanaryQuestion.getOutGraph() + "> { " // + + " ?a a qa:AnnotationOfSpotInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " // + + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + + " ] " // + + " ] ; " // + + " oa:annotatedBy ; " // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + "BIND (IRI(str(RAND())) AS ?a) ." // + + "BIND (now() as ?time) " // + "}"; myQanaryUtils.updateTripleStore(sparql, myQanaryQuestion.getEndpoint().toString()); } diff --git a/qanary_component-NER-Dandelion/src/main/java/eu/wdaqua/qanary/dandelion/Dandelion.java b/qanary_component-NER-Dandelion/src/main/java/eu/wdaqua/qanary/dandelion/Dandelion.java index 9666ab478..466d438c3 100644 --- a/qanary_component-NER-Dandelion/src/main/java/eu/wdaqua/qanary/dandelion/Dandelion.java +++ b/qanary_component-NER-Dandelion/src/main/java/eu/wdaqua/qanary/dandelion/Dandelion.java @@ -127,7 +127,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-EntityClassifier2/src/main/java/eu/wdaqua/qanary/EntityClassifier2/EntityClassifier2.java b/qanary_component-NER-EntityClassifier2/src/main/java/eu/wdaqua/qanary/EntityClassifier2/EntityClassifier2.java index 427f1c6c6..68a42b10b 100644 --- a/qanary_component-NER-EntityClassifier2/src/main/java/eu/wdaqua/qanary/EntityClassifier2/EntityClassifier2.java +++ b/qanary_component-NER-EntityClassifier2/src/main/java/eu/wdaqua/qanary/EntityClassifier2/EntityClassifier2.java @@ -135,7 +135,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/Application.java b/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/Application.java index 22f0d9f2e..417ee74c0 100644 --- a/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/Application.java +++ b/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/Application.java @@ -1,5 +1,6 @@ package eu.wdaqua.qanary.FOX; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -20,8 +21,8 @@ public class Application { * QanaryServiceController in the qanary_component-template */ @Bean - public QanaryComponent qanaryComponent() { - return new FOXComponent(); + public QanaryComponent qanaryComponent(@Value("${spring.application.name}") final String applicationName) { + return new FOXComponent(applicationName); } public static void main(String[] args) { diff --git a/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/FOXComponent.java b/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/FOXComponent.java index 02710a411..7c89ae8ec 100644 --- a/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/FOXComponent.java +++ b/qanary_component-NER-FOX/src/main/java/eu/wdaqua/qanary/FOX/FOXComponent.java @@ -8,6 +8,7 @@ import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -32,6 +33,12 @@ public class FOXComponent extends QanaryComponent { private static final Logger logger = LoggerFactory.getLogger(FOXComponent.class); private static final String foxService = "http://fox-demo.aksw.org/api"; + private final String applicationName; + + public FOXComponent(@Value("${spring.application.name}") final String applicationName) { + this.applicationName = applicationName; + } + /** * default processor of a QanaryMessage */ @@ -83,34 +90,34 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { myQanaryUtils.updateTripleStore(sparql, myQanaryMessage.getEndpoint().toString()); //Align to QANARY commons - sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " - + "INSERT { " - + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " - + " ?a a qa:AnnotationOfSpotInstance . " - + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " - + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " - + " oa:hasSelector [ " - + " a oa:TextPositionSelector ; " - + " oa:start ?begin ; " - + " oa:end ?end " - + " ] " - + " ] ; " - + " oa:annotatedBy ; " - + " oa:AnnotatedAt ?time " - + "}} " - + "WHERE { " - + " SELECT ?a ?s ?begin ?end ?time " - + " WHERE { " - + " graph <" + namedGraphTemp + "> { " - + " ?s ?begin . " - + " ?s ?end . " - + " BIND (IRI(str(RAND())) AS ?a) ." - + " BIND (now() as ?time) " - + " } " - + " } " + sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " // + + " ?a a qa:AnnotationOfSpotInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start ?begin ; " // + + " oa:end ?end " // + + " ] " // + + " ] ; " // + + " oa:annotatedBy ;" // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + " SELECT ?a ?s ?begin ?end ?time " // + + " WHERE { " // + + " graph <" + namedGraphTemp + "> { " // + + " ?s ?begin . " // + + " ?s ?end . " // + + " BIND (IRI(str(RAND())) AS ?a) ." // + + " BIND (now() as ?time) " // + + " } " // + + " } " // + "}"; myQanaryUtils.updateTripleStore(sparql, myQanaryMessage.getEndpoint().toString()); diff --git a/qanary_component-NER-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNER.java b/qanary_component-NER-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNER.java index 125d06e68..cd2926279 100644 --- a/qanary_component-NER-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNER.java +++ b/qanary_component-NER-Ontotext/src/main/java/eu/wdaqua/qanary/ontotext/OntoTextNER.java @@ -118,17 +118,28 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { logger.info("apply vocabulary alignment on outgraph"); // TODO: implement this (custom for every component) for (Selection s : selections) { - String sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " + "INSERT { " + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " - + " ?a a qa:AnnotationOfSpotInstance . " + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " - + " oa:hasSelector [ " + " a oa:TextPositionSelector ; " - + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " - + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " + " ] " - + " ] ; " + " oa:annotatedBy "+this.applicationName+" ; " - + " oa:AnnotatedAt ?time " + "}} " + "WHERE { " + "BIND (IRI(str(RAND())) AS ?a) ." - + "BIND (now() as ?time) " + "}"; + String sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " // + + " ?a a qa:AnnotationOfSpotInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " // + + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + + " ] " // + + " ] ; " // + + " oa:annotatedBy ; " // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + "BIND (IRI(str(RAND())) AS ?a) ." // + + "BIND (now() as ?time) " // + + "}"; myQanaryUtils.updateTripleStore(sparql, myQanaryMessage.getEndpoint().toString()); } return myQanaryMessage; diff --git a/qanary_component-NER-TextRazor/src/main/java/eu/wdaqua/qanary/mypackage/TextRazor.java b/qanary_component-NER-TextRazor/src/main/java/eu/wdaqua/qanary/mypackage/TextRazor.java index 369f54378..6c3498f8b 100644 --- a/qanary_component-NER-TextRazor/src/main/java/eu/wdaqua/qanary/mypackage/TextRazor.java +++ b/qanary_component-NER-TextRazor/src/main/java/eu/wdaqua/qanary/mypackage/TextRazor.java @@ -108,17 +108,28 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { logger.info("apply vocabulary alignment on outgraph"); // TODO: implement this (custom for every component) for (Selection s : selections) { - String sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " + "INSERT { " + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " - + " ?a a qa:AnnotationOfSpotInstance . " + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " - + " oa:hasSelector [ " + " a oa:TextPositionSelector ; " - + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " - + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " + " ] " - + " ] ; " + " oa:annotatedBy "+this.applicationName+" ; " - + " oa:AnnotatedAt ?time " + "}} " + "WHERE { " + "BIND (IRI(str(RAND())) AS ?a) ." - + "BIND (now() as ?time) " + "}"; + String sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " // + + " ?a a qa:AnnotationOfSpotInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " // + + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + + " ] " // + + " ] ; " // + + " oa:annotatedBy ; " // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + "BIND (IRI(str(RAND())) AS ?a) ." // + + "BIND (now() as ?time) " // + + "}"; myQanaryUtils.updateTripleStore(sparql, myQanaryMessage.getEndpoint().toString()); } return myQanaryMessage; diff --git a/qanary_component-NER-ambiverse/src/main/java/eu/wdaqua/qanary/ambiverse/AmbiverseNER.java b/qanary_component-NER-ambiverse/src/main/java/eu/wdaqua/qanary/ambiverse/AmbiverseNER.java index db584a53e..d8c60bb81 100644 --- a/qanary_component-NER-ambiverse/src/main/java/eu/wdaqua/qanary/ambiverse/AmbiverseNER.java +++ b/qanary_component-NER-ambiverse/src/main/java/eu/wdaqua/qanary/ambiverse/AmbiverseNER.java @@ -152,7 +152,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy "+this.applicationName+" ; " // + + " oa:annotatedBy ; " // + " oa:AnnotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/Application.java b/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/Application.java index a2f556b3a..0e9570f87 100644 --- a/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/Application.java +++ b/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/Application.java @@ -1,5 +1,6 @@ package eu.wdaqua.qanary.stanfordner; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -20,8 +21,8 @@ public class Application { * QanaryServiceController in the qanary_component-template */ @Bean - public QanaryComponent qanaryComponent() { - return new StanfordNERComponent(); + public QanaryComponent qanaryComponent(@Value("${spring.application.name}") final String applicationName) { + return new StanfordNERComponent(applicationName); } public static void main(String[] args) { diff --git a/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponent.java b/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponent.java index 4eafcda29..f775bb038 100644 --- a/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponent.java +++ b/qanary_component-NER-stanford/src/main/java/eu/wdaqua/qanary/stanfordner/StanfordNERComponent.java @@ -6,6 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import edu.stanford.nlp.ling.CoreAnnotations.NamedEntityTagAnnotation; @@ -31,13 +32,17 @@ public class StanfordNERComponent extends QanaryComponent { private static final Logger logger = LoggerFactory.getLogger(StanfordNERComponent.class); private StanfordCoreNLP myStanfordCoreNLP; - public StanfordNERComponent() { + private final String applicationName; + + public StanfordNERComponent(@Value("${spring.application.name}") final String applicationName) { // ATTENTION: This should be done only ones when the component is started // Define the properties needed for the pipeline of the Stanford parser Properties props = new Properties(); props.put("annotators", "tokenize, ssplit, pos, lemma, ner"); props.setProperty("ner.useSUTime", "false"); myStanfordCoreNLP = new StanfordCoreNLP(props); + + this.applicationName = applicationName; } /** @@ -136,7 +141,7 @@ protected void insertSelectionsIntoQanaryTriplestore(Selection s, QanaryQuestion + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + " ] " // + " ] ; " // - + " oa:annotatedBy ; " // + + " oa:annotatedBy ;" // + " oa:annotatedAt ?time " // + "}} " // + "WHERE { " // diff --git a/qanary_component-NER-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNER.java b/qanary_component-NER-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNER.java index 50067e2ae..f2b761481 100644 --- a/qanary_component-NER-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNER.java +++ b/qanary_component-NER-tagme/src/main/java/eu/wdaqua/qanary/tagme/TagmeNER.java @@ -118,17 +118,28 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { logger.info("apply vocabulary alignment on outgraph"); // TODO: implement this (custom for every component) for (Selection s : selections) { - String sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " + "INSERT { " + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " - + " ?a a qa:AnnotationOSpotfInstance . " + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " - + " oa:hasSelector [ " + " a oa:TextPositionSelector ; " - + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " - + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " + " ] " - + " ] ; " + " oa:annotatedBy "+this.applicationName+" ; " - + " oa:AnnotatedAt ?time " + "}} " + "WHERE { " + "BIND (IRI(str(RAND())) AS ?a) ." - + "BIND (now() as ?time) " + "}"; + String sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + myQanaryMessage.getOutGraph() + "> { " // + + " ?a a qa:AnnotationOSpotfInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + myQanaryQuestion.getUri() + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start \"" + s.begin + "\"^^xsd:nonNegativeInteger ; " // + + " oa:end \"" + s.end + "\"^^xsd:nonNegativeInteger " // + + " ] " // + + " ] ; " // + + " oa:annotatedBy ; " // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + "BIND (IRI(str(RAND())) AS ?a) ." // + + "BIND (now() as ?time) " // + + "}"; myQanaryUtils.updateTripleStore(sparql, myQanaryMessage.getEndpoint().toString()); } return myQanaryMessage; diff --git a/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/Application.java b/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/Application.java index 8ffeba811..fe4efe0ea 100644 --- a/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/Application.java +++ b/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/Application.java @@ -1,5 +1,6 @@ package eu.wdaqua.qanary.LuceneLinker; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -20,8 +21,8 @@ public class Application { * QanaryServiceController in the qanary_component-template */ @Bean - public QanaryComponent qanaryComponent() { - return new LuceneLinker(); + public QanaryComponent qanaryComponent(@Value("${spring.application.name}") final String applicationName) { + return new LuceneLinker(applicationName); } public static void main(String[] args) { diff --git a/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/LuceneLinker.java b/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/LuceneLinker.java index 037380c0b..1653e1cdd 100644 --- a/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/LuceneLinker.java +++ b/qanary_component-NERD-Lucene-Linker/src/main/java/eu/wdaqua/qanary/LuceneLinker/LuceneLinker.java @@ -23,6 +23,7 @@ import org.apache.lucene.util.AttributeSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; @@ -45,6 +46,12 @@ public class LuceneLinker extends QanaryComponent { private static final Logger logger = LoggerFactory.getLogger(LuceneLinker.class); + private final String applicationName; + + public LuceneLinker(@Value("${spring.application.name}") final String applicationName) { + this.applicationName = applicationName; + } + /** * default processor of a QanaryMessage */ @@ -177,28 +184,29 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) { logger.info("Apply commons alignment on outgraph"); for (Annotation a : annotations) { - sparql = "prefix qa: " - + "prefix oa: " - + "prefix xsd: " - + "INSERT { " - + "GRAPH <" + namedGraph + "> { " - + " ?a a qa:AnnotationOfInstance . " - + " ?a oa:hasTarget [ " - + " a oa:SpecificResource; " - + " oa:hasSource <" + uriQuestion + ">; " - + " oa:hasSelector [ " - + " a oa:TextPositionSelector ; " - + " oa:start \"" + a.begin + "\"^^xsd:nonNegativeInteger ; " - + " oa:end \"" + a.end + "\"^^xsd:nonNegativeInteger " - + " ] " - + " ] . " - + " ?a oa:hasBody <" + a.uri + "> ;" - + " oa:annotatedBy ; " - + " oa:AnnotatedAt ?time " - + "}} " - + "WHERE { " - + "BIND (IRI(str(RAND())) AS ?a) ." - + "BIND (now() as ?time) " + "}"; + sparql = "prefix qa: " // + + "prefix oa: " // + + "prefix xsd: " // + + "INSERT { " // + + "GRAPH <" + namedGraph + "> { " // + + " ?a a qa:AnnotationOfInstance . " // + + " ?a oa:hasTarget [ " // + + " a oa:SpecificResource; " // + + " oa:hasSource <" + uriQuestion + ">; " // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start \"" + a.begin + "\"^^xsd:nonNegativeInteger ; " // + + " oa:end \"" + a.end + "\"^^xsd:nonNegativeInteger " // + + " ] " // + + " ] . " // + + " ?a oa:hasBody <" + a.uri + "> ;" // + + " oa:annotatedBy ;" // + + " oa:AnnotatedAt ?time " // + + "}} " // + + "WHERE { " // + + "BIND (IRI(str(RAND())) AS ?a) ." // + + "BIND (now() as ?time) " // + + "}"; loadTripleStore(sparql, endpoint); } } catch (IOException e) { diff --git a/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/src/main/java/eu/wdaqua/qanary/component/querybuilder/ComicCharacterAlterEgoSimpleDBpediaQueryBuilder.java b/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/src/main/java/eu/wdaqua/qanary/component/querybuilder/ComicCharacterAlterEgoSimpleDBpediaQueryBuilder.java index 2a8c21bbb..aec2aae8e 100644 --- a/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/src/main/java/eu/wdaqua/qanary/component/querybuilder/ComicCharacterAlterEgoSimpleDBpediaQueryBuilder.java +++ b/qanary_component-QB-ComicCharacterAlterEgoSimpleDBpediaQueryBuilder/src/main/java/eu/wdaqua/qanary/component/querybuilder/ComicCharacterAlterEgoSimpleDBpediaQueryBuilder.java @@ -57,28 +57,27 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { return myQanaryMessage; } - String getAnnotation = "" + - "PREFIX qa: " + - "PREFIX oa: " + - "SELECT ?a ?dbpediaResource ?startOfSpecificResource ?endOfSpecificResource ?annotatorComponent ?time " + - "FROM <" + myQanaryMessage.getInGraph().toString() + "> " + - "WHERE {" + - " VALUES ?dbpediaResource {" + - " <" + qanaryQuestion.getUri().toString() + ">" + - " } ." + - " ?a a qa:AnnotationOfSpotInstance ." + - " ?a oa:hasTarget [" + - " a oa:SpecificResource;" + - " oa:hasSource ?dbpediaResource;" + - " oa:hasSelector [ " + - " a oa:TextPositionSelector ; " + - " oa:start ?startOfSpecificResource ; " + - " oa:end ?endOfSpecificResource " + - " ]" + - " ] ." + - " ?a oa:annotatedBy "+this.applicationName+" . " + - " ?a oa:AnnotatedAt ?time ." + - "}"; + String getAnnotation = "PREFIX qa: " // + + "PREFIX oa: " // + + "SELECT ?a ?dbpediaResource ?startOfSpecificResource ?endOfSpecificResource ?annotatorComponent ?time " // + + "FROM <" + myQanaryMessage.getInGraph().toString() + "> " // + + "WHERE {" // + + " VALUES ?dbpediaResource {" // + + " <" + qanaryQuestion.getUri().toString() + ">" // + + " } ." // + + " ?a a qa:AnnotationOfSpotInstance ." // + + " ?a oa:hasTarget [" // + + " a oa:SpecificResource;" // + + " oa:hasSource ?dbpediaResource;" // + + " oa:hasSelector [ " // + + " a oa:TextPositionSelector ; " // + + " oa:start ?startOfSpecificResource ; " // + + " oa:end ?endOfSpecificResource " // + + " ]" // + + " ] ." // + + " ?a oa:annotatedBy . " // + + " ?a oa:AnnotatedAt ?time ." // + + "}"; ResultSet resultSet = qanaryUtils.selectFromTripleStore(getAnnotation); diff --git a/qanary_component-QB-SimpleRealNameOfSuperHero/src/main/java/eu/wdaqua/qanary/component/querybuilder/QueryBuilderSimpleRealNameOfSuperHero.java b/qanary_component-QB-SimpleRealNameOfSuperHero/src/main/java/eu/wdaqua/qanary/component/querybuilder/QueryBuilderSimpleRealNameOfSuperHero.java index 9ddfd41de..1529dcd17 100644 --- a/qanary_component-QB-SimpleRealNameOfSuperHero/src/main/java/eu/wdaqua/qanary/component/querybuilder/QueryBuilderSimpleRealNameOfSuperHero.java +++ b/qanary_component-QB-SimpleRealNameOfSuperHero/src/main/java/eu/wdaqua/qanary/component/querybuilder/QueryBuilderSimpleRealNameOfSuperHero.java @@ -123,7 +123,7 @@ public QanaryMessage process(QanaryMessage myQanaryMessage) throws Exception { // as it is rule based, a high confidence is expressed + " ?newAnnotation qa:score \"1.0\"^^xsd:float ." + " ?newAnnotation oa:annotatedAt ?time ." // - + " ?newAnnotation oa:annotatedBy "+this.applicationName+" ." // + + " ?newAnnotation oa:annotatedBy ." // + " }" // + "}" // + "WHERE {" //