diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cd08a47..fcbb2d354 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,4 +9,4 @@ * 【all】 升级JDK最低支持到8 ### Bug修复 -* 【http】 修复Cookie中host失效导致的问题 +* 【http】 修复Cookie中host失效导致的问题(issue#583@Github) diff --git a/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java b/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java index 7e79c870e..87cb0af32 100644 --- a/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java +++ b/hutool-dfa/src/main/java/cn/hutool/dfa/WordTree.java @@ -160,7 +160,7 @@ public class WordTree extends HashMap{ return null; } - List findedWords = new ArrayList(); + List foundWords = new ArrayList<>(); WordTree current = this; int length = text.length(); //存放查找到的字符缓存。完整出现一个词时加到findedWords中,否则清空 @@ -187,10 +187,10 @@ public class WordTree extends HashMap{ wordBuffer.append(currentChar); if(current.isEnd(currentChar)){ //到达单词末尾,关键词成立,从此词的下一个位置开始查找 - findedWords.add(wordBuffer.toString()); - if(limit > 0 && findedWords.size() >= limit){ + foundWords.add(wordBuffer.toString()); + if(limit > 0 && foundWords.size() >= limit){ //超过匹配限制个数,直接返回 - return findedWords; + return foundWords; } if(false == isDensityMatch){ //如果非密度匹配,跳过匹配到的词 @@ -208,7 +208,7 @@ public class WordTree extends HashMap{ } current = this; } - return findedWords; + return foundWords; } diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/test/DfaTest.java b/hutool-dfa/src/test/java/cn/hutool/dfa/test/DfaTest.java index cd4433d55..f6e338155 100644 --- a/hutool-dfa/src/test/java/cn/hutool/dfa/test/DfaTest.java +++ b/hutool-dfa/src/test/java/cn/hutool/dfa/test/DfaTest.java @@ -93,6 +93,15 @@ public class DfaTest { List all = tree.matchAll("AAAAAAAt-ioBBBBBBB"); Assert.assertEquals(all, CollectionUtil.newArrayList("t-io")); } + + @Test + public void aTest(){ + WordTree tree = new WordTree(); + tree.addWord("women"); + String text = "a WOMEN todo.".toLowerCase(); + List matchAll = tree.matchAll(text, -1, false, false); + Assert.assertEquals("[women]", matchAll.toString()); + } // ---------------------------------------------------------------------------------------------------------- /**