OPENNLP-1315: Remove unnecessary call to "toString()" (#382)
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
index 4c95b75..bcc61a9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
@@ -48,7 +48,7 @@
help.append(format);
}
}
- return "converts " + help.toString() + " data format to native OpenNLP format";
+ return "converts " + help + " data format to native OpenNLP format";
} else if (2 < factories.keySet().size()) {
for (String format : factories.keySet()) {
if (!StreamFactoryRegistry.DEFAULT_FORMAT.equals(format)) {
@@ -106,7 +106,7 @@
try (ObjectStream<T> sampleStream = streamFactory.create(formatArgs)) {
Object sample;
while ((sample = sampleStream.read()) != null) {
- System.out.println(sample.toString());
+ System.out.println(sample);
}
}
catch (IOException e) {
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
index 8243560..3cd98b8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
@@ -369,7 +369,7 @@
if (details.length() > 0) {
details.setLength(details.length() - 1);
- usage.append("\n\nArguments description:\n").append(details.toString());
+ usage.append("\n\nArguments description:\n").append(details);
}
return usage.toString();
@@ -456,7 +456,7 @@
}
if (args.length / 2 > argumentCount) {
- return "Unrecognized parameters encountered: " + parameters.toString();
+ return "Unrecognized parameters encountered: " + parameters;
}
return null;
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
index 95c7c73..06fe227 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
@@ -186,7 +186,7 @@
}
private static void usage() {
- System.out.print("OpenNLP " + Version.currentVersion().toString() + ". ");
+ System.out.print("OpenNLP " + Version.currentVersion() + ". ");
System.out.println("Usage: " + CMD + " TOOL");
System.out.println("where TOOL is one of:");
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
index 4fe6a10..7485cca 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
@@ -90,9 +90,9 @@
if (detailedFMeasureListener == null) {
FMeasure result = validator.getFMeasure();
- System.out.println(result.toString());
+ System.out.println(result);
} else {
- System.out.println(detailedFMeasureListener.toString());
+ System.out.println(detailedFMeasureListener);
}
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
index 716dee2..54854da 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
@@ -99,7 +99,7 @@
if (detailedFMeasureListener == null) {
System.out.println(evaluator.getFMeasure());
} else {
- System.out.println(detailedFMeasureListener.toString());
+ System.out.println(detailedFMeasureListener);
}
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
index 49a640c..7c619c9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
@@ -75,7 +75,7 @@
String category = documentCategorizerME.getBestCategory(prob);
DocumentSample sample = new DocumentSample(category, tokens);
- System.out.println(sample.toString());
+ System.out.println(sample);
perfMon.incrementCounter();
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/langdetect/LanguageDetectorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/langdetect/LanguageDetectorTool.java
index 6175fe3..e76b3c8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/langdetect/LanguageDetectorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/langdetect/LanguageDetectorTool.java
@@ -74,7 +74,7 @@
Language lang = langDetectME.predictLanguage(document);
LanguageSample sample = new LanguageSample(lang, document);
- System.out.println(sample.toString());
+ System.out.println(sample);
perfMon.incrementCounter();
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerMETool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerMETool.java
index 90ba95d..5940ed1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerMETool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerMETool.java
@@ -76,7 +76,7 @@
posSample.getTags());
System.out.println(new LemmaSample(posSample.getSentence(),
- posSample.getTags(), lemmas).toString());
+ posSample.getTags(), lemmas));
perfMon.incrementCounter();
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
index 6e62577..7f4cbd1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
@@ -161,7 +161,7 @@
if (detailedFListener == null) {
System.out.println(validator.getFMeasure());
} else {
- System.out.println(detailedFListener.toString());
+ System.out.println(detailedFListener);
}
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
index e5ab7d2..b524d78 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
@@ -140,7 +140,7 @@
if (detailedFListener == null) {
System.out.println(evaluator.getFMeasure());
} else {
- System.out.println(detailedFListener.toString());
+ System.out.println(detailedFListener);
}
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
index a5c9bd6..551215f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
@@ -97,7 +97,7 @@
NameSample nameSample = new NameSample(whitespaceTokenizerLine,
reducedNames, false);
- System.out.println(nameSample.toString());
+ System.out.println(nameSample);
perfMon.incrementCounter();
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
index 3f1959e..64ec09a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
@@ -67,7 +67,7 @@
String[] tags = tagger.tag(whitespaceTokenizerLine);
POSSample sample = new POSSample(whitespaceTokenizerLine, tags);
- System.out.println(sample.toString());
+ System.out.println(sample);
perfMon.incrementCounter();
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
index 55d1df6..c088d9d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
@@ -89,6 +89,6 @@
FMeasure result = validator.getFMeasure();
- System.out.println(result.toString());
+ System.out.println(result);
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
index c207d3d..2147ae8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
@@ -84,6 +84,6 @@
FMeasure result = validator.getFMeasure();
- System.out.println(result.toString());
+ System.out.println(result);
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
index 8d63acc..8aa9975 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
@@ -60,7 +60,7 @@
if (!dir.isDirectory()) {
throw new IllegalArgumentException(
"All passed in directories must be directories, but \""
- + dir.toString() + "\" is not!");
+ + dir + "\" is not!");
}
inputDirectoryList.add(dir);
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/LogProbability.java b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/LogProbability.java
index 12b9660..2eebce9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/LogProbability.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/LogProbability.java
@@ -129,6 +129,6 @@
}
public String toString() {
- return label.toString() + ":" + probability;
+ return label + ":" + probability;
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probability.java b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probability.java
index ed7bfcd..524a076 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probability.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probability.java
@@ -128,6 +128,6 @@
}
public String toString() {
- return label == null ? "" + probability : label.toString() + ":" + probability;
+ return label == null ? "" + probability : label + ":" + probability;
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java b/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
index 776b586..e63b9e6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
@@ -183,7 +183,7 @@
if (derivation != null) {
p.derivation = new StringBuffer(100);
- p.derivation.append(this.derivation.toString());
+ p.derivation.append(this.derivation);
}
p.label = this.label;
return (p);
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java
index c4164f4..52941fe 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java
@@ -330,7 +330,7 @@
}
throw new InvalidFormatException("Tag dictionary contains tags "
+ "which are unknown by the model! The unknown tags are: "
- + unknownTag.toString());
+ + unknownTag);
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/stemmer/snowball/SnowballStemmer.java b/opennlp-tools/src/main/java/opennlp/tools/stemmer/snowball/SnowballStemmer.java
index 321b478..063d3a4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/stemmer/snowball/SnowballStemmer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/stemmer/snowball/SnowballStemmer.java
@@ -115,7 +115,7 @@
stemmer = new turkishStemmer();
}
else {
- throw new IllegalStateException("Unexpected stemmer algorithm: " + algorithm.toString());
+ throw new IllegalStateException("Unexpected stemmer algorithm: " + algorithm);
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
index 85f1c07..97f6311 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
@@ -55,7 +55,7 @@
for (Span tokenSpan : tokenSpans) {
if (tokenSpan.getStart() < 0 || tokenSpan.getStart() > text.length() ||
tokenSpan.getEnd() > text.length() || tokenSpan.getEnd() < 0) {
- throw new IllegalArgumentException("Span " + tokenSpan.toString() +
+ throw new IllegalArgumentException("Span " + tokenSpan +
" is out of bounds, text length: " + text.length() + "!");
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/Span.java b/opennlp-tools/src/main/java/opennlp/tools/util/Span.java
index 1c389b1..4576f03 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/Span.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/Span.java
@@ -227,7 +227,7 @@
*/
public CharSequence getCoveredText(CharSequence text) {
if (getEnd() > text.length()) {
- throw new IllegalArgumentException("The span " + toString()
+ throw new IllegalArgumentException("The span " + this
+ " is outside the given text which has length " + text.length() + "!");
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
index 6dbc41c..9429fbb 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/TokenPatternFeatureGenerator.java
@@ -84,6 +84,6 @@
}
}
- feats.add("pta=" + pattern.toString());
+ feats.add("pta=" + pattern);
}
}
