Fix LANG-1771: Handle malformed input '[String' in getShortCanonicalName

Author: abhisripathi

src/main/java/org/apache/commons/lang3/ClassUtils.java

@@ -496,9 +496,10 @@ private static String getCanonicalName(final String name) {
         className = className.substring(dim);
         if (className.startsWith("L")) {
             className = className.substring(1, className.endsWith(";") ? className.length() - 1 : className.length());
-        } else if (!className.isEmpty()) {
-            className = reverseAbbreviationMap.get(className.substring(0, 1));
+        } else if (className.length() == 1 && reverseAbbreviationMap.containsKey(className)) {
+            className = reverseAbbreviationMap.get(className);
         }
+
         final StringBuilder canonicalClassNameBuffer = new StringBuilder(className.length() + dim * 2);
         canonicalClassNameBuffer.append(className);
         for (int i = 0; i < dim; i++) {

src/main/java/org/apache/commons/lang3/StringUtils.java

@@ -3208,36 +3208,6 @@ public static boolean isAllUpperCase(final CharSequence cs) {
         return true;
     }
 
-    /**
-     * Counts the number of uppercase characters in the given {@code CharSequence}.
-     *
-     * <p>{@code null} or an empty CharSequence returns {@code 0}.</p>
-     *
-     * <pre>
-     * StringUtils.countUpperCaseLetters(null)    = 0
-     * StringUtils.countUpperCaseLetters("")      = 0
-     * StringUtils.countUpperCaseLetters("abc")   = 0
-     * StringUtils.countUpperCaseLetters("ABC")   = 3
-     * StringUtils.countUpperCaseLetters("AbC1")  = 2
-     * </pre>
-     *
-     * @param cs the CharSequence to check, may be null
-     * @return the number of uppercase characters in the CharSequence, or {@code 0} if null/empty
-     */
-    
-    public static int countUpperCaseLetters(final CharSequence cs) {
-    	if(cs == null || cs.length() == 0) {
-    		return 0;
-    	}
-    	
-    	int count=0;
-    	for(int i=0; i<cs.length(); i++) {
-    		if(Character.isUpperCase(cs.charAt(i))) {
-    			count++;
-    		}
-    	}
-    	return count;
-    }
     /**
      * Tests if the CharSequence contains only Unicode letters.
      *

src/test/java/org/apache/commons/lang3/ClassUtilsTest.java

@@ -237,6 +237,15 @@ public void test_getAllSuperclasses_Class() {
         assertNull(ClassUtils.getAllSuperclasses(null));
     }
 
+    @Test
+    public void test_getShortCanonicalName_MalformedInput() {
+        assertEquals("String[]", ClassUtils.getShortCanonicalName("[String"));
+    }
+    @Test
+    public void test_getShortCanonicalName_MissingSemicolon() {
+        assertEquals("String[]", ClassUtils.getShortCanonicalName("[LString"));
+    }
+
     @Test
     public void test_getCanonicalName_Class() {
         assertEquals("org.apache.commons.lang3.ClassUtils", ClassUtils.getCanonicalName(ClassUtils.class));

src/test/java/org/apache/commons/lang3/StringUtilsTest.java

@@ -937,20 +937,6 @@ public void testIsAllUpperCase() {
         assertFalse(StringUtils.isAllUpperCase("A1C"));
         assertFalse(StringUtils.isAllUpperCase("A/C"));
     }
-
-    /**
-     * Test for {@link StringUtils#countUpperCaseLetters(CharSequence)}.
-     */
-    @Test
-    public void testCountUpperCaseLetters() {
-        assertEquals(5, StringUtils.countUpperCaseLetters("HELLO"));
-        assertEquals(2, StringUtils.countUpperCaseLetters("HelloWorld"));
-        assertEquals(0, StringUtils.countUpperCaseLetters("helloworld"));
-        assertEquals(0, StringUtils.countUpperCaseLetters("1234"));
-        assertEquals(0, StringUtils.countUpperCaseLetters(""));
-        assertEquals(0, StringUtils.countUpperCaseLetters(null));
-    }
-    
     /**
      * Test for {@link StringUtils#isMixedCase(CharSequence)}.
      */