Skip to content

Commit ada66f9

Browse files
committed
fix review comments
1 parent b686df8 commit ada66f9

2 files changed

Lines changed: 11 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,6 @@ public static String getShortClassName(final Class<?> cls) {
10271027
dim++;
10281028
c = c.getComponentType();
10291029
}
1030-
10311030
final String base;
10321031
// Preserve legacy behavior for anonymous/local classes (keeps compiler ordinals: $13, $10Named, etc.)
10331032
if (c.isAnonymousClass() || c.isLocalClass()) {
@@ -1039,14 +1038,9 @@ public static String getShortClassName(final Class<?> cls) {
10391038
parts.push(x.getSimpleName());
10401039
x = x.getDeclaringClass();
10411040
}
1042-
base = String.join(String.valueOf(PACKAGE_SEPARATOR_CHAR), parts);
1043-
}
1044-
1045-
final StringBuilder sb = new StringBuilder(base);
1046-
for (int i = 0; i < dim; i++) {
1047-
sb.append("[]");
1041+
base = String.join(".", parts);
10481042
}
1049-
return sb.toString();
1043+
return base + StringUtils.repeat("[]", dim);
10501044
}
10511045

10521046
/**

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Pa$$word {
3030
}
3131

3232
/**
33-
* Tests for https://issues.apache.org/jira/browse/LANG-1818
33+
* Tests for <a href="https://issues.apache.org/jira/browse/LANG-1818">LANG-1818</a>
3434
*/
3535
public class ClassUtilsShortClassNameTest {
3636

@@ -46,31 +46,29 @@ class Ne$ted {
4646

4747
@Test
4848
void testDollarSignImmediatelyAfterPackage() {
49-
String result = ClassUtils.getShortClassName($trange.class);
50-
assertEquals("$trange", result);
49+
assertEquals("$trange", ClassUtils.getShortClassName($trange.class));
5150
}
5251

5352
@Test
5453
void testDollarSignWithinName() {
55-
String result = ClassUtils.getShortClassName(Pa$$word.class);
56-
assertEquals("Pa$$word", result);
54+
assertEquals("Pa$$word", ClassUtils.getShortClassName(Pa$$word.class));
5755
}
5856

5957
@Test
6058
void testMultipleDollarSigns() {
61-
String result = ClassUtils.getShortClassName($Inner.class);
62-
assertEquals(getClass().getSimpleName() + ".$Inner", result);
59+
assertEquals(getClass().getSimpleName() + ".$Inner",
60+
ClassUtils.getShortClassName($Inner.class));
6361
}
6462

6563
@Test
6664
void testInnerClassName() {
67-
String result = ClassUtils.getShortClassName(Inner.class);
68-
assertEquals(getClass().getSimpleName() + ".Inner", result);
65+
assertEquals(getClass().getSimpleName() + ".Inner",
66+
ClassUtils.getShortClassName(Inner.class));
6967
}
7068

7169
@Test
7270
void testNe$tedClassName() {
73-
String result = ClassUtils.getShortClassName(Inner.Ne$ted.class);
74-
assertEquals(getClass().getSimpleName() + ".Inner.Ne$ted", result);
71+
assertEquals(getClass().getSimpleName() + ".Inner.Ne$ted",
72+
ClassUtils.getShortClassName(Inner.Ne$ted.class));
7573
}
7674
}

0 commit comments

Comments
 (0)