You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2018/09/28 16:36:07 UTC
[1/3] [text] TEXT-118: JSON escaping incorrect for the delete control
character
Repository: commons-text
Updated Branches:
refs/heads/master 4baa89f03 -> 8ae4ff075
TEXT-118: JSON escaping incorrect for the delete control character
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/47aefa39
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/47aefa39
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/47aefa39
Branch: refs/heads/master
Commit: 47aefa392ebe7e2ea777318b9c5d7f8b9d201b85
Parents: 1898b78
Author: Nandor Kollar <nk...@cloudera.com>
Authored: Fri Sep 28 15:35:11 2018 +0200
Committer: Nandor Kollar <nk...@cloudera.com>
Committed: Fri Sep 28 15:35:11 2018 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/text/StringEscapeUtils.java | 2 +-
.../java/org/apache/commons/text/StringEscapeUtilsTest.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/47aefa39/src/main/java/org/apache/commons/text/StringEscapeUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StringEscapeUtils.java b/src/main/java/org/apache/commons/text/StringEscapeUtils.java
index 3ac66ff..b183233 100644
--- a/src/main/java/org/apache/commons/text/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/text/StringEscapeUtils.java
@@ -108,7 +108,7 @@ public class StringEscapeUtils {
ESCAPE_JSON = new AggregateTranslator(
new LookupTranslator(Collections.unmodifiableMap(escapeJsonMap)),
new LookupTranslator(EntityArrays.JAVA_CTRL_CHARS_ESCAPE),
- JavaUnicodeEscaper.outsideOf(32, 0x7f)
+ JavaUnicodeEscaper.outsideOf(32, 0x7e)
);
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/47aefa39/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 2d36c13..e9abe7b 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -633,4 +633,10 @@ public class StringEscapeUtilsTest {
assertEquals(jsonString, StringEscapeUtils.unescapeJson(escapedJsonString));
}
+
+ @Test
+ public void testDeleteCharacter() {
+ String deleteString = "Delete: \u007F";
+ assertEquals("Delete: \\u007F", StringEscapeUtils.escapeJson(deleteString));
+ }
}
[3/3] [text] TEXT-118: thanks @nandorKollar
Posted by ch...@apache.org.
TEXT-118: thanks @nandorKollar
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/8ae4ff07
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/8ae4ff07
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/8ae4ff07
Branch: refs/heads/master
Commit: 8ae4ff0755a59b48713cfde2c12929230799008b
Parents: addaa69
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Sep 28 12:35:56 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Sep 28 12:35:56 2018 -0400
----------------------------------------------------------------------
pom.xml | 3 +++
src/changes/changes.xml | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/8ae4ff07/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 49ab80e..f79cfd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,9 @@
<contributor>
<name>Jan Martin Keil</name>
</contributor>
+ <contributor>
+ <name>Nandor Kollar</name>
+ </contributor>
</contributors>
<scm>
http://git-wip-us.apache.org/repos/asf/commons-text/blob/8ae4ff07/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dce92bd..91d507d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="1.5" date="2018-MM-DD" description="Release 1.5">
+ <action issue="TEXT-118" type="fix" dev="chtompki" due-to="Nandor Kollar">JSON escaping incorrect for the delete control character</action>
<action issue="TEXT-130" type="fix" dev="chtompki" due-to="Jan Martin Keil">Fixes JaroWinklerDistance: Wrong results due to precision of transpositions</action>
<action issue="TEXT-131" type="fix" dev="chtompki" due-to="Jan Martin Keil">JaroWinklerDistance: Calculation deviates from definition</action>
<action issue="TEXT-132" type="update" dev="ggregory">Update Apache Commons Lang from 3.7 to 3.8.1</action>
[2/3] [text] Merge branch 'TEXT-118' of
https://github.com/nandorKollar/commons-text
Posted by ch...@apache.org.
Merge branch 'TEXT-118' of https://github.com/nandorKollar/commons-text
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/addaa697
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/addaa697
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/addaa697
Branch: refs/heads/master
Commit: addaa697aac9233f5ae01e3b509a0f48db6d397d
Parents: 4baa89f 47aefa3
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Sep 28 12:10:18 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Sep 28 12:10:18 2018 -0400
----------------------------------------------------------------------
src/main/java/org/apache/commons/text/StringEscapeUtils.java | 2 +-
.../java/org/apache/commons/text/StringEscapeUtilsTest.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------