From d72d1d734a72e9e109f0855385eef11ee4c90822 Mon Sep 17 00:00:00 2001 From: Ben Knoll Date: Fri, 10 Jan 2020 16:12:17 -0600 Subject: [PATCH] Updated for version 0.3.0+ of mtap (#37) --- java/build.gradle | 2 +- .../src/main/java/edu/umn/biomedicus/rtf/MTAPDocumentsSink.java | 2 +- java/src/main/java/edu/umn/biomedicus/rtf/RtfProcessor.java | 2 +- .../java/edu/umn/biomedicus/utilities/PtbReaderProcessor.java | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/build.gradle b/java/build.gradle index 3d8219f5..d1f87a27 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -88,7 +88,7 @@ dependencies { implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - implementation group: 'edu.umn.nlpie', name: 'mtap', version: '[0.1.0, )' + implementation group: 'edu.umn.nlpie', name: 'mtap', version: '[0.3.0, )' implementation group: 'edu.umn.biomedicus', name: 'biomedicus-tokenizer', version: '0.0.3' implementation group: 'org.rocksdb', name: 'rocksdbjni', version: '6.0.1' implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' diff --git a/java/src/main/java/edu/umn/biomedicus/rtf/MTAPDocumentsSink.java b/java/src/main/java/edu/umn/biomedicus/rtf/MTAPDocumentsSink.java index 813f846a..b443f082 100644 --- a/java/src/main/java/edu/umn/biomedicus/rtf/MTAPDocumentsSink.java +++ b/java/src/main/java/edu/umn/biomedicus/rtf/MTAPDocumentsSink.java @@ -68,7 +68,7 @@ public void propertyChanged(String destinationName, } Document done(Event event, String documentName) { - Document document = event.addDocument(documentName, sb.toString()); + Document document = event.createDocument(documentName, sb.toString()); for (PropertyWatcher propertyWatcher : propertyWatchers) { propertyWatcher.done(document); } diff --git a/java/src/main/java/edu/umn/biomedicus/rtf/RtfProcessor.java b/java/src/main/java/edu/umn/biomedicus/rtf/RtfProcessor.java index dc5c2844..f70b30c6 100644 --- a/java/src/main/java/edu/umn/biomedicus/rtf/RtfProcessor.java +++ b/java/src/main/java/edu/umn/biomedicus/rtf/RtfProcessor.java @@ -106,7 +106,7 @@ public void process(@NotNull Event event, @NotNull JsonObject params, @NotNull J while ((code = bis.read()) != -1) { sb.append((char) code); } - event.addDocument(outputDocumentName, sb.toString()); + event.createDocument(outputDocumentName, sb.toString()); } } catch (IOException e) { throw new IllegalStateException(e); diff --git a/java/src/main/java/edu/umn/biomedicus/utilities/PtbReaderProcessor.java b/java/src/main/java/edu/umn/biomedicus/utilities/PtbReaderProcessor.java index 8c5bf860..ec7f77a5 100644 --- a/java/src/main/java/edu/umn/biomedicus/utilities/PtbReaderProcessor.java +++ b/java/src/main/java/edu/umn/biomedicus/utilities/PtbReaderProcessor.java @@ -89,7 +89,7 @@ public void process(@NotNull Event event, throw new IllegalStateException(e); } - Document target = event.addDocument(targetDocumentName, documentBuilder.toString()); + Document target = event.createDocument(targetDocumentName, documentBuilder.toString()); String sentencesIndex = (String) params.getOrDefault("sentences_index", "sentences"); target.addLabels(sentencesIndex, true, sentences); String posTagsIndex = (String) params.getOrDefault("pos_tags_index", "pos_tags"); diff --git a/setup.py b/setup.py index 8058141b..c7bfb90d 100644 --- a/setup.py +++ b/setup.py @@ -112,7 +112,7 @@ def run_tests(self): 'biomedicus': ['defaultConfig.yml', 'biomedicus-all.jar'] }, install_requires=[ - 'mtap', + 'mtap>=0.3.0', 'numpy', 'pyyaml', 'regex',