You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jz...@apache.org on 2020/06/02 14:56:36 UTC
[opennlp-addons] branch master updated: [OPENNLP-1260] Replaced
instances of FileWriter with BufferedWriter (#4)
This is an automated email from the ASF dual-hosted git repository.
jzemerick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/opennlp-addons.git
The following commit(s) were added to refs/heads/master by this push:
new e668c4e [OPENNLP-1260] Replaced instances of FileWriter with BufferedWriter (#4)
e668c4e is described below
commit e668c4ea385b592e94815970b0cce2a55e2d2f76
Author: Xia Li <47...@users.noreply.github.com>
AuthorDate: Tue Jun 2 09:56:29 2020 -0500
[OPENNLP-1260] Replaced instances of FileWriter with BufferedWriter (#4)
Co-authored-by: bd2019us <>
---
.../opennlp/addons/geoentitylinker/indexing/GeonamesProcessor.java | 4 +++-
.../opennlp/addons/geoentitylinker/indexing/RegionProcessor.java | 6 ++++--
.../java/opennlp/addons/geoentitylinker/indexing/USGSProcessor.java | 4 +++-
.../opennlp/addons/modelbuilder/impls/GenericModelableImpl.java | 6 ++++--
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/GeonamesProcessor.java b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/GeonamesProcessor.java
index 8b57aaa..cd032e8 100644
--- a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/GeonamesProcessor.java
+++ b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/GeonamesProcessor.java
@@ -16,6 +16,7 @@
package opennlp.addons.geoentitylinker.indexing;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -146,6 +147,7 @@ public class GeonamesProcessor {
public static void writeCountryContextFile(File outfile, Map<String, AdminBoundary> adms) {
// FileWriter writer = null;
try (FileWriter writer = new FileWriter(outfile, true)) {
+ BufferedWriter bw = new BufferedWriter(writer);
for (String admKey : adms.keySet()) {
AdminBoundary adm = adms.get(admKey);
@@ -157,7 +159,7 @@ public class GeonamesProcessor {
String line = adm.getCountryCode() + "\t" + adm.getProvCode() + "\t" + "" + "\t" + country + "\t" + province + "\t" + "" + "\t" + "(" + country + ")" + "\t"
+ adm.getProvinceName() + "\t" + adm.getCountyName() + "\n";
- writer.write(line);
+ bw.write(line);
// System.out.println(line);
}
diff --git a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/RegionProcessor.java b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/RegionProcessor.java
index f457822..de91e0c 100644
--- a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/RegionProcessor.java
+++ b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/RegionProcessor.java
@@ -16,6 +16,7 @@
package opennlp.addons.geoentitylinker.indexing;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -102,11 +103,12 @@ public class RegionProcessor {
w.commit();
}
FileWriter writer = new FileWriter(outputCountryContextfile, true);
+ BufferedWriter bw = new BufferedWriter(writer);
for (String string : ccfileentries) {
- writer.write(string);
+ bw.write(string);
}
System.out.println("successfully wrote Region entries to country oontext file");
- writer.close();
+ bw.close();
System.out.println("Completed indexing regions!");
}
diff --git a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/USGSProcessor.java b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/USGSProcessor.java
index fcd61c1..59c94b7 100644
--- a/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/USGSProcessor.java
+++ b/geoentitylinker-addon/src/main/java/opennlp/addons/geoentitylinker/indexing/USGSProcessor.java
@@ -16,6 +16,7 @@
package opennlp.addons.geoentitylinker.indexing;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -225,6 +226,7 @@ public class USGSProcessor {
public static void writeCountryContextFile(File outfile, Map<String, AdminBoundary> adms) {
// FileWriter writer = null;
try (FileWriter writer = new FileWriter(outfile, true)) {
+ BufferedWriter bw = new BufferedWriter(writer);
for (String admkey : adms.keySet()) {
AdminBoundary adm = adms.get(admkey);
@@ -239,7 +241,7 @@ public class USGSProcessor {
*/
String line = adm.getCountryCode() + "\t" + adm.getProvCode() + "\t" + adm.getCountyCode() + "\t" + country + "\t" + province + "\t" + adm.getCountyName() + "\t"
+ "(U\\.S\\.[ $]|U\\.S\\.A\\.[ $]|United States|the US[ $]|a us[ $])" + "\t" + adm.getProvinceName() + "\t" + adm.getCountyName() + "\n";
- writer.write(line);
+ bw.write(line);i
/// System.out.println(line);
}
diff --git a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
index 2a0a730..ccfddcb 100644
--- a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
+++ b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/GenericModelableImpl.java
@@ -19,6 +19,7 @@ import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
+import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
@@ -61,11 +62,12 @@ public class GenericModelableImpl implements Modelable {
try {
FileWriter writer = new FileWriter(params.getAnnotatedTrainingDataFile(), false);
+ BufferedWriter bw = new BufferedWriter(writer);
for (String s : annotatedSentences) {
- writer.write(s.replace("\n", " ").trim() + "\n");
+ bw.write(s.replace("\n", " ").trim() + "\n");
}
- writer.close();
+ bw.close();
} catch (IOException ex) {
ex.printStackTrace();
}