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

polishing

This commit is contained in:
Juergen Hoeller 2011-10-11 01:00:31 +00:00
parent 37c601c8dd
commit 339c57e41a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,21 +116,20 @@ public abstract class GenericTypeResolver {
public static Class<?> resolveReturnTypeArgument(Method method, Class<?> genericIfc) { public static Class<?> resolveReturnTypeArgument(Method method, Class<?> genericIfc) {
Type returnType = method.getReturnType(); Type returnType = method.getReturnType();
Type genericReturnType = method.getGenericReturnType(); Type genericReturnType = method.getGenericReturnType();
ParameterizedType targetType;
if (returnType.equals(genericIfc)) { if (returnType.equals(genericIfc)) {
if (genericReturnType instanceof ParameterizedType) { if (genericReturnType instanceof ParameterizedType) {
targetType = (ParameterizedType)genericReturnType; ParameterizedType targetType = (ParameterizedType) genericReturnType;
Type[] actualTypeArguments = targetType.getActualTypeArguments(); Type[] actualTypeArguments = targetType.getActualTypeArguments();
Type typeArg = actualTypeArguments[0]; Type typeArg = actualTypeArguments[0];
if (!(typeArg instanceof WildcardType)) { if (!(typeArg instanceof WildcardType)) {
return (Class<?>)typeArg; return (Class<?>) typeArg;
} }
} }
else { else {
return null; return null;
} }
} }
return GenericTypeResolver.resolveTypeArgument((Class<?>)returnType, genericIfc); return GenericTypeResolver.resolveTypeArgument((Class<?>) returnType, genericIfc);
} }
/** /**

6
org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 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.
@ -128,8 +128,8 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
} }
/** /**
* Set whether to use Spring-based scanning for entity classes in the classpath * Specify packages to search using Spring-based scanning for entity classes in
* instead of listing annotated classes explicitly. * the classpath. This is an alternative to listing annotated classes explicitly.
* <p>Default is none. Specify packages to search for autodetection of your entity * <p>Default is none. Specify packages to search for autodetection of your entity
* classes in the classpath. This is analogous to Spring's component-scan feature * classes in the classpath. This is analogous to Spring's component-scan feature
* ({@link org.springframework.context.annotation.ClassPathBeanDefinitionScanner}). * ({@link org.springframework.context.annotation.ClassPathBeanDefinitionScanner}).