Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow LookupTranslator to support CharSequence properly; previously it was working only for CharSequence's that implemented hashCode and equals(Object). LANG-882 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1470822 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2013-04-23 06:00:41 +00:00
parent cd91a4f2cd
commit 0cdc976684
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/changes/changes.xml
View File

@ -22,6 +22,7 @@
<body>
<release version="3.2" date="TBA" description="Next release">
<action issue="LANG-882" type="update">LookupTranslator now works with implementations of CharSequence other than String </action>
<action issue="LANG-754" type="fix">ClassUtils.getShortName(String) will now only do a reverse lookup for array types</action>
<action issue="LANG-886" type="add">Added CharSetUtils.containsAny(String, String)</action>
<action issue="LANG-846" type="update">Provide CharSequenceUtils.regionMatches with a proper green implementation instead of inefficiently converting to Strings</action>

17
src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java
View File

@ -23,31 +23,32 @@ import java.util.HashMap;
/**
* Translates a value using a lookup table.
*
* NOTE: This class is broken for any CharSequence implementation that does not define
* equals(Object) and hashCode() methods as the class uses the CharSequence as
* the key to a HashMap. See http://issues.apache.org/jira/browse/LANG-882.
*
* @since 3.0
* @version $Id$
*/
public class LookupTranslator extends CharSequenceTranslator {
private final HashMap<CharSequence, CharSequence> lookupMap;
private final HashMap<String, CharSequence> lookupMap;
private final int shortest;
private final int longest;
/**
* 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, while the value remains as a java.lang.CharSequence.
* 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]
*/
public LookupTranslator(final CharSequence[]... lookup) {
lookupMap = new HashMap<CharSequence, CharSequence>();
lookupMap = new HashMap<String, CharSequence>();
int _shortest = Integer.MAX_VALUE;
int _longest = 0;
if (lookup != null) {
for (final CharSequence[] seq : lookup) {
this.lookupMap.put(seq[0], seq[1]);
this.lookupMap.put(seq[0].toString(), seq[1]);
final int sz = seq[0].length();
if (sz < _shortest) {
_shortest = sz;
@ -73,7 +74,7 @@ public class LookupTranslator extends CharSequenceTranslator {
// descend so as to get a greedy algorithm
for (int i = max; i >= shortest; i--) {
final CharSequence subSeq = input.subSequence(index, index + i);
final CharSequence result = lookupMap.get(subSeq);
final CharSequence result = lookupMap.get(subSeq.toString());
if (result != null) {
out.write(result.toString());
return i;

10
src/test/java/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java
View File

@ -39,4 +39,14 @@ public class LookupTranslatorTest {
assertEquals("Incorrect value", "two", out.toString());
}
// Tests: https://issues.apache.org/jira/browse/LANG-882
@Test
public void testLang882() throws IOException {
final LookupTranslator lt = new LookupTranslator(new CharSequence[][] { { new StringBuffer("one"), new StringBuffer("two") } });
final StringWriter out = new StringWriter();
final int result = lt.translate(new StringBuffer("one"), 0, out);
assertEquals("Incorrect codepoint consumption", 3, result);
assertEquals("Incorrect value", "two", out.toString());
}
}