Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backported public signatures in GenericTypeResolver (SPR-8005)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-12-01 12:52:33 +00:00
parent e6f4e16219
commit c82dab6497
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@@ -213,7 +213,7 @@ public abstract class GenericTypeResolver {
* @param typeVariableMap the TypeVariable Map to resolved against
* @return the type if it resolves to a Class, or <code>Object.class</code> otherwise
*/
static Class resolveType(Type genericType, Map<TypeVariable, Type> typeVariableMap) {
public static Class<?> resolveType(Type genericType, Map<TypeVariable, Type> typeVariableMap) {
Type rawType = getRawType(genericType, typeVariableMap);
return (rawType instanceof Class ? (Class) rawType : Object.class);
}
@@ -246,7 +246,7 @@ public abstract class GenericTypeResolver {
* {@link Class} for the specified {@link Class}. Searches all super types,
* enclosing types and interfaces.
*/
static Map<TypeVariable, Type> getTypeVariableMap(Class clazz) {
public static Map<TypeVariable, Type> getTypeVariableMap(Class clazz) {
Reference<Map<TypeVariable, Type>> ref = typeVariableCache.get(clazz);
Map<TypeVariable, Type> typeVariableMap = (ref != null ? ref.get() : null);