root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use Class.getTypeName() where appropriate 

Issue: SPR-15237
This commit is contained in:
Christoph Dreis 2017-02-08 20:36:41 +01:00
parent d41d28f8ce
commit 5cfa7e71bb
3 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
spring-core/src/main/java/org/springframework/util/ClassUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -480,28 +480,7 @@ public abstract class ClassUtils {
*/ */
public static String getQualifiedName(Class<?> clazz) { public static String getQualifiedName(Class<?> clazz) {
Assert.notNull(clazz, "Class must not be null"); Assert.notNull(clazz, "Class must not be null");
if (clazz.isArray()) { return clazz.getTypeName();
return getQualifiedNameForArray(clazz);
}
else {
return clazz.getName();
}
}
/**
* Build a nice qualified name for an array:
* component type class name + "[]".
* @param clazz the array class
* @return a qualified name for the array class
*/
private static String getQualifiedNameForArray(Class<?> clazz) {
StringBuilder result = new StringBuilder();
while (clazz.isArray()) {
clazz = clazz.getComponentType();
result.append(ARRAY_SUFFIX);
}
result.insert(0, clazz.getName());
return result.toString();
} }
/** /**
@ -552,11 +531,8 @@ public abstract class ClassUtils {
} }
return result.toString(); return result.toString();
} }
else if (clazz.isArray()) {
return getQualifiedNameForArray(clazz);
}
else { else {
return clazz.getName(); return clazz.getTypeName();
} }
} }
@ -567,8 +543,7 @@ public abstract class ClassUtils {
*/ */
public static boolean matchesTypeName(Class<?> clazz, String typeName) { public static boolean matchesTypeName(Class<?> clazz, String typeName) {
return (typeName != null && return (typeName != null &&
(typeName.equals(clazz.getName()) || typeName.equals(clazz.getSimpleName()) || (typeName.equals(clazz.getTypeName()) || typeName.equals(clazz.getSimpleName())));
(clazz.isArray() && typeName.equals(getQualifiedNameForArray(clazz)))));
} }

20
spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -62,23 +62,7 @@ public class FormatHelper {
if (clazz == null) { if (clazz == null) {
return "null"; return "null";
} }
if (clazz.isArray()) { return clazz.getTypeName();
StringBuilder sb = new StringBuilder();
int dims = 1;
Class<?> baseClass = clazz.getComponentType();
while (baseClass.isArray()) {
baseClass = baseClass.getComponentType();
dims++;
}
sb.append(baseClass.getName());
for (int i = 0; i < dims; i++) {
sb.append("[]");
}
return sb.toString();
}
else {
return clazz.getName();
}
} }
} }

3
spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -48,6 +48,7 @@ public class ReflectionHelperTests extends AbstractExpressionTests {
public void testFormatHelperForClassName() { public void testFormatHelperForClassName() {
assertEquals("java.lang.String",FormatHelper.formatClassNameForMessage(String.class)); assertEquals("java.lang.String",FormatHelper.formatClassNameForMessage(String.class));
assertEquals("java.lang.String[]",FormatHelper.formatClassNameForMessage(new String[1].getClass())); assertEquals("java.lang.String[]",FormatHelper.formatClassNameForMessage(new String[1].getClass()));
assertEquals("java.lang.String[][]",FormatHelper.formatClassNameForMessage(new String[1][1].getClass()));
assertEquals("int[]",FormatHelper.formatClassNameForMessage(new int[1].getClass())); assertEquals("int[]",FormatHelper.formatClassNameForMessage(new int[1].getClass()));
assertEquals("int[][]",FormatHelper.formatClassNameForMessage(new int[1][2].getClass())); assertEquals("int[][]",FormatHelper.formatClassNameForMessage(new int[1][2].getClass()));
assertEquals("null",FormatHelper.formatClassNameForMessage(null)); assertEquals("null",FormatHelper.formatClassNameForMessage(null));