You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/07 21:30:30 UTC
[4/4] [lang] Merge branch 'LANG-1135'
Merge branch 'LANG-1135'
LANG-1135: Add method containsAllWords to WordUtils. Thanks to Eduardo Martins.
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/9604c853
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/9604c853
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/9604c853
Branch: refs/heads/master
Commit: 9604c853069562e8c4219ae27eaa4b2bad59eabc
Parents: dee9444 1182950
Author: Benedikt Ritter <br...@apache.org>
Authored: Thu May 7 21:28:25 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Thu May 7 21:28:25 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
.../org/apache/commons/lang3/StringUtils.java | 2 +-
.../apache/commons/lang3/text/WordUtils.java | 42 ++++++++++++++++++++
.../commons/lang3/text/WordUtilsTest.java | 20 ++++++++++
4 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9604c853/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 6268c85,73c50fc..4b694b8
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -22,11 -22,7 +22,12 @@@
<body>
<release version="3.5" date="tba" description="tba">
+ <action issue="LANG-1135" type="add" dev="britter" due-to="Eduardo Martins">Add method containsAllWords to WordUtils</action>
+ <action issue="LANG-1132" type="add" dev="britter" due-to="Jack Tan">ReflectionToStringBuilder doesn't throw IllegalArgumentException when the constructor's object param is null</action>
+ <action issue="LANG-1122" type="fix" dev="britter" due-to="Adrian Ber">Inconsistent behavior of swap for malformed inputs</action>
+ <action issue="LANG-701" type="add" dev="britter" due-to="James Sawle">StringUtils join with var args</action>
+ <action issue="LANG-1130" type="fix" dev="britter">Fix critical issues reported by SonarQube</action>
+ <action issue="LANG-1131" type="fix" dev="britter">StrBuilder.equals(StrBuilder) doesn't check for null inputs</action>
<action issue="LANG-1105" type="add" dev="britter" due-to="Hendrik Saly">Add ThreadUtils - A utility class which provides helper methods related to java.lang.Thread</action>
<action issue="LANG-1031" type="add" dev="britter" due-to="Felipe Adorno">Add annotations to exclude fields from ReflectionEqualsBuilder, ReflectionToStringBuilder and ReflectionHashCodeBuilder</action>
<action issue="LANG-1127" type="add" dev="chas">Unit test helpers which set and reset default Locale and TimeZone</action>
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9604c853/src/main/java/org/apache/commons/lang3/StringUtils.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/commons/lang3/StringUtils.java
index 726ecc0,aa7b23e..29d7098
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@@ -1685,8 -1685,7 +1685,8 @@@ public class StringUtils
* StringUtils.containsAny("", *) = false
* StringUtils.containsAny(*, null) = false
* StringUtils.containsAny(*, []) = false
- * StringUtils.containsAny("abcd", "ab", "cd") = false
+ * StringUtils.containsAny("abcd", "ab", null) = false
+ * StringUtils.containsAny("abcd", "ab", "cd") = true
* StringUtils.containsAny("abc", "d", "abc") = true
* </pre>
*
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9604c853/src/main/java/org/apache/commons/lang3/text/WordUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9604c853/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java
----------------------------------------------------------------------