Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EDB011A07 for ; Mon, 21 Apr 2014 16:50:00 +0000 (UTC) Received: (qmail 56564 invoked by uid 500); 21 Apr 2014 16:49:58 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 56477 invoked by uid 500); 21 Apr 2014 16:49:58 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 56465 invoked by uid 99); 21 Apr 2014 16:49:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Apr 2014 16:49:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Apr 2014 16:49:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B13A238889B; Mon, 21 Apr 2014 16:49:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588924 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/StringUtils.java test/java/org/apache/maven/shared/utils/StringUtilsTest.java Date: Mon, 21 Apr 2014 16:49:36 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140421164936.5B13A238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Mon Apr 21 16:49:35 2014 New Revision: 1588924 URL: http://svn.apache.org/r1588924 Log: [MSHARED-330] added StringUtils.endsWithIgnoreCase() Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java?rev=1588924&r1=1588923&r2=1588924&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java Mon Apr 21 16:49:35 2014 @@ -2502,10 +2502,45 @@ public class StringUtils * @param searchStr the String to find, may be null * @return true if the String contains the search String, * false if not or null string input - * */ public static boolean contains( @Nullable String str, @Nullable String searchStr ) { return !( str == null || searchStr == null ) && str.contains( searchStr ); } + + /** + *

Checks if String ends with a search String, handling null.

+ *

+ *

A null String will return false.

+ *

+ *

+     * StringUtils.endsWithIgnoreCase(null, *)     = false
+     * StringUtils.endsWithIgnoreCase(*, null)     = false
+     * StringUtils.endsWithIgnoreCase("", "")      = true
+     * StringUtils.endsWithIgnoreCase("abc", "")   = true
+     * StringUtils.endsWithIgnoreCase("abc", "C")  = true
+     * StringUtils.endsWithIgnoreCase("abc", "a")  = false
+     * 
+ * + * @param str the String to check, may be null + * @param searchStr the String to find at end, may be null + * @return true if the String ends with the search String, + * false if not or null string input + * + */ + public static boolean endsWithIgnoreCase( @Nullable String str, @Nullable String searchStr ) + { + if ( str == null || searchStr == null ) + { + // for consistency with contains + return false; + } + + if ( str.length() < searchStr.length() ) + { + return false; + } + + return str.regionMatches( true, str.length() - searchStr.length(), searchStr, 0, searchStr.length() ); + } } Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java?rev=1588924&r1=1588923&r2=1588924&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java Mon Apr 21 16:49:35 2014 @@ -550,6 +550,28 @@ public class StringUtilsTest } @Test + public void testEndsWithIgnoreCase() + { + assertThat( StringUtils.endsWithIgnoreCase( null, null ) + , is( false ) ); + + assertThat( StringUtils.endsWithIgnoreCase( null, "string" ) + , is( false ) ); + + assertThat( StringUtils.endsWithIgnoreCase( "string", null ) + , is( false ) ); + + assertThat( StringUtils.endsWithIgnoreCase( "string", "ing" ) + , is( true ) ); + + assertThat( StringUtils.endsWithIgnoreCase( "string", "a string" ) + , is( false ) ); + + assertThat( StringUtils.endsWithIgnoreCase( "string", "str" ) + , is( false ) ); + } + + @Test public void testEquals() { assertThat( StringUtils.equals( null, null ) @@ -2063,5 +2085,4 @@ public class StringUtilsTest } - }