TEXT-58: translator ordering respect, and deleting methods deprecated for refactoring purposes
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/5c460425 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/5c460425 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/5c460425 Branch: refs/heads/master Commit: 5c46042505c0d8410777666cb125edbbec1ff769 Parents: 8e85dea Author: Rob Tompkins <chtom...@gmail.com> Authored: Sat Jan 21 20:01:26 2017 -0500 Committer: Rob Tompkins <chtom...@gmail.com> Committed: Sat Jan 21 20:01:26 2017 -0500 ---------------------------------------------------------------------- .../apache/commons/text/StringEscapeUtils.java | 4 +-- .../text/translate/LookupTranslator.java | 32 -------------------- 2 files changed, 2 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/5c460425/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 47c4d7c..6b08805 100644 --- a/src/main/java/org/apache/commons/text/StringEscapeUtils.java +++ b/src/main/java/org/apache/commons/text/StringEscapeUtils.java @@ -155,9 +155,9 @@ public class StringEscapeUtils { escapeXml10Map.put("\ufffe", StringUtils.EMPTY); escapeXml10Map.put("\uffff", StringUtils.EMPTY); ESCAPE_XML10 = new AggregateTranslator( - new LookupTranslator(Collections.unmodifiableMap(escapeXml10Map)), new LookupTranslator(EntityArrays.BASIC_ESCAPE), new LookupTranslator(EntityArrays.APOS_ESCAPE), + new LookupTranslator(Collections.unmodifiableMap(escapeXml10Map)), NumericEntityEscaper.between(0x7f, 0x84), NumericEntityEscaper.between(0x86, 0x9f), new UnicodeUnpairedSurrogateRemover() @@ -180,9 +180,9 @@ public class StringEscapeUtils { escapeXml11Map.put("\ufffe", StringUtils.EMPTY); escapeXml11Map.put("\uffff", StringUtils.EMPTY); ESCAPE_XML11 = new AggregateTranslator( - new LookupTranslator(Collections.unmodifiableMap(escapeXml11Map)), new LookupTranslator(EntityArrays.BASIC_ESCAPE), new LookupTranslator(EntityArrays.APOS_ESCAPE), + new LookupTranslator(Collections.unmodifiableMap(escapeXml11Map)), NumericEntityEscaper.between(0x1, 0x8), NumericEntityEscaper.between(0xe, 0x1f), NumericEntityEscaper.between(0x7f, 0x84), http://git-wip-us.apache.org/repos/asf/commons-text/blob/5c460425/src/main/java/org/apache/commons/text/translate/LookupTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java index b381938..a9a344f 100644 --- a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java +++ b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java @@ -38,38 +38,6 @@ public class LookupTranslator extends CharSequenceTranslator { /** * Define the lookup table to be used in translation * - * Note that, as of Lang 3.1, the key to the lookup table is converted to a - * java.lang.String. This is because we need the key to support hashCode and - * equals(Object), allowing it to be the key for a HashMap. See LANG-882. - * - * @param lookup CharSequence[][] table of size [*][2] - */ - @Deprecated - public LookupTranslator(final CharSequence[]... lookup) { - lookupMap = new HashMap<>(); - prefixSet = new HashSet<>(); - int _shortest = Integer.MAX_VALUE; - int _longest = 0; - if (lookup != null) { - for (final CharSequence[] seq : lookup) { - this.lookupMap.put(seq[0].toString(), seq[1].toString()); - this.prefixSet.add(seq[0].charAt(0)); - final int sz = seq[0].length(); - if (sz < _shortest) { - _shortest = sz; - } - if (sz > _longest) { - _longest = sz; - } - } - } - shortest = _shortest; - longest = _longest; - } - - /** - * Define the lookup table to be used in translation - * * Note that, as of Lang 3.1 (the orgin of this code), the key to the lookup * table is converted to a java.lang.String. This is because we need the key * to support hashCode and equals(Object), allowing it to be the key for a
