You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2017/05/17 15:52:46 UTC
[20/50] opennlp git commit: NoJira: Trivial fixes,
use try-with-resources, closes apache/opennlp#186
NoJira: Trivial fixes, use try-with-resources, closes apache/opennlp#186
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/98036628
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/98036628
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/98036628
Branch: refs/heads/LangDetect
Commit: 980366284db98e0515dc5e827aaf4f750699bc80
Parents: bbbb431
Author: smarthi <sm...@apache.org>
Authored: Thu Apr 27 18:40:23 2017 -0400
Committer: smarthi <sm...@apache.org>
Committed: Thu Apr 27 18:40:23 2017 -0400
----------------------------------------------------------------------
.../tools/cmdline/TokenNameFinderToolTest.java | 20 +++++--------------
.../convert/FileToStringSampleStreamTest.java | 21 ++++++++++----------
2 files changed, 15 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/98036628/opennlp-tools/src/test/java/opennlp/tools/cmdline/TokenNameFinderToolTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/cmdline/TokenNameFinderToolTest.java b/opennlp-tools/src/test/java/opennlp/tools/cmdline/TokenNameFinderToolTest.java
index ba02e50..a163b0c 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/cmdline/TokenNameFinderToolTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/cmdline/TokenNameFinderToolTest.java
@@ -95,13 +95,11 @@ public class TokenNameFinderToolTest {
}
private File trainModel() throws IOException {
-
- String encoding = "ISO-8859-1";
ObjectStream<String> lineStream =
new PlainTextByLineStream(new MockInputStreamFactory(
- new File("opennlp/tools/namefind/AnnotatedSentencesWithTypes.txt")), encoding);
- ObjectStream<NameSample> sampleStream = new NameSampleDataStream(lineStream);
+ new File("opennlp/tools/namefind/AnnotatedSentencesWithTypes.txt")),
+ StandardCharsets.ISO_8859_1);
TrainingParameters params = new TrainingParameters();
params.put(TrainingParameters.ITERATIONS_PARAM, 70);
@@ -111,24 +109,16 @@ public class TokenNameFinderToolTest {
TokenNameFinderFactory nameFinderFactory = new TokenNameFinderFactory();
- try {
+ try (ObjectStream<NameSample> sampleStream = new NameSampleDataStream(lineStream)) {
model = NameFinderME.train("en", null, sampleStream, params,
nameFinderFactory);
}
- finally {
- sampleStream.close();
- }
-
- BufferedOutputStream modelOut = null;
File modelFile = File.createTempFile("model", ".bin");
- try {
- modelOut = new BufferedOutputStream(new FileOutputStream(modelFile));
+ try (BufferedOutputStream modelOut =
+ new BufferedOutputStream(new FileOutputStream(modelFile))) {
model.serialize(modelOut);
- } finally {
- if (modelOut != null)
- modelOut.close();
}
return modelFile;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/98036628/opennlp-tools/src/test/java/opennlp/tools/convert/FileToStringSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/convert/FileToStringSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/convert/FileToStringSampleStreamTest.java
index 6f6f7dc..e9f3892 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/convert/FileToStringSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/convert/FileToStringSampleStreamTest.java
@@ -45,7 +45,8 @@ public class FileToStringSampleStreamTest {
List<String> sentences = Arrays.asList(sentence1, sentence2);
- DirectorySampleStream directorySampleStream = new DirectorySampleStream(directory.getRoot(), null, false);
+ DirectorySampleStream directorySampleStream =
+ new DirectorySampleStream(directory.getRoot(), null, false);
File tempFile1 = directory.newFile();
FileUtils.writeStringToFile(tempFile1, sentence1);
@@ -53,17 +54,15 @@ public class FileToStringSampleStreamTest {
File tempFile2 = directory.newFile();
FileUtils.writeStringToFile(tempFile2, sentence2);
- FileToStringSampleStream stream =
- new FileToStringSampleStream(directorySampleStream, Charset.defaultCharset());
+ try (FileToStringSampleStream stream =
+ new FileToStringSampleStream(directorySampleStream, Charset.defaultCharset())) {
- String read = stream.read();
- Assert.assertTrue(sentences.contains(read));
-
- read = stream.read();
- Assert.assertTrue(sentences.contains(read));
-
- stream.close();
-
+ String read = stream.read();
+ Assert.assertTrue(sentences.contains(read));
+
+ read = stream.read();
+ Assert.assertTrue(sentences.contains(read));
+ }
}
}