Merge branch 'pr-119'
This closes #119
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a27134f..9a16d7e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,6 +49,7 @@
<action type="update" dev="ggregory" due-to="Gary Gregory">[test] junit-jupiter 5.5.1 -> 5.5.2.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">com.puppycrawl.tools:checkstyle 8.23 -> 8.24.</action>
<action issue="TEXT-166" type="fix" dev="kinow" due-to="Mikko Maunu">removed non-existing parameter from Javadocs and spelled out parameters in throws</action>
+ <action issue="TEXT-149" type="fix" dev="kinow" due-to="Yuji Konishi">StringEscapeUtils.unescapeCsv doesn't remove quotes at begin and end of string</action>
</release>
<release version="1.8" date="2019-08-30" description="Release 1.8">
diff --git a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
index b6c11b3..69301d6 100644
--- a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
+++ b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
@@ -87,7 +87,7 @@
// deal with escaped quotes; ie) ""
out.write(StringUtils.replace(quoteless, CSV_ESCAPED_QUOTE_STR, CSV_QUOTE_STR));
} else {
- out.write(input.toString());
+ out.write(quoteless);
}
}
}
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 8bafdb1..a1ef2e6 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -460,7 +460,7 @@
assertEquals("", StringEscapeUtils.unescapeCsv(""));
assertNull(StringEscapeUtils.unescapeCsv(null));
- assertEquals("\"foo.bar\"", StringEscapeUtils.unescapeCsv("\"foo.bar\""));
+ assertEquals("foo.bar", StringEscapeUtils.unescapeCsv("\"foo.bar\""));
}
@Test
@@ -474,7 +474,7 @@
checkCsvUnescapeWriter("", null);
checkCsvUnescapeWriter("", "");
- checkCsvUnescapeWriter("\"foo.bar\"", "\"foo.bar\"");
+ checkCsvUnescapeWriter("foo.bar", "\"foo.bar\"");
}
private void checkCsvUnescapeWriter(final String expected, final String value) {
