Fix javadoc warnings

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java

@@ -32,7 +32,7 @@
 /**
  * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
  * asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}.
- * Typically used with the {@link org.springframework.context.task.Async} annotation.
+ * Typically used with the {@link org.springframework.scheduling.annotation.Async} annotation.
  *
  * <p>In terms of target method signatures, any parameter types are supported.
  * However, the return type is constrained to either <code>void</code> or

spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java

@@ -28,8 +28,9 @@
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 
 /**
- * Base class for dynamic {@link TargetSource} implementations that create new prototype
- * bean instances to support a pooling or new-instance-per-invocation strategy.
+ * Base class for dynamic {@link org.springframework.aop.TargetSource} implementations
+ * that create new prototype bean instances to support a pooling or
+ * new-instance-per-invocation strategy.
  *
  * <p>Such TargetSources must run in a {@link BeanFactory}, as it needs to
  * call the <code>getBean</code> method to create a new prototype instance.

spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java

@@ -31,7 +31,7 @@
  * @author Chris Beams
  * @since 3.1
  * @see EnableAsync
- * @see AsyncConfigurationSelector
+ * @see org.springframework.scheduling.annotation.AsyncConfigurationSelector
  */
 @Configuration
 public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {

spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java

@@ -52,8 +52,9 @@
  * BeanPostProcessor} which in turn means that you <em>cannot</em>
  * use {@code @Autowired} to inject references into
  * {@link org.springframework.beans.factory.config.BeanPostProcessor
- * BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please
- * consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
+ * BeanPostProcessor} or
+ * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor BeanFactoryPostProcessor}
+ * types. Please consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
  * class (which, by default, checks for the presence of this annotation).
  *
  * @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java

@@ -37,8 +37,9 @@
  * BeanPostProcessor} which in turn means that you <em>cannot</em> use
  * {@code @Value} within
  * {@link org.springframework.beans.factory.config.BeanPostProcessor
- * BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please
- * consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
+ * BeanPostProcessor} or
+ * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor BeanFactoryPostProcessor}
+ * types. Please consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
  * class (which, by default, checks for the presence of this annotation).
  *
  * @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java

@@ -36,8 +36,8 @@
  *
  *<pre class="code">{@code
  *<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/>
- *    <property name="driverClassName" value="}${driver}{@code"/>
- *    <property name="url" value="jdbc:}${dbname}{@code"/>
+ *    <property name="driverClassName" value="}${driver}{@code "/>
+ *    <property name="url" value="jdbc:}${dbname}{@code "/>
  *</bean>
  *}</pre>
  *
@@ -76,7 +76,7 @@
  * <p>Example XML property with default value:
  *
  *<pre class="code">{@code
- *  <property name="url" value="jdbc:}${dbname:defaultdb}{@code"/>
+ *  <property name="url" value="jdbc:}${dbname:defaultdb}{@code "/>
  *}</pre>
  *
  * @author Chris Beams

spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java

@@ -353,7 +353,7 @@ public void initDefaults(Element root) {
 	 * <literal>parentDefaults</literal> in case the defaults are not explicitly set
 	 * locally.
 	 * @param defaults the defaults to populate
-	 * @param defaults the parent BeanDefinitionParserDelegate (if any) defaults to fall back to
+	 * @param parentDefaults the parent BeanDefinitionParserDelegate (if any) defaults to fall back to
 	 * @param root the root element of the current bean definition document (or nested beans element)
 	 */
 	protected void populateDefaults(DocumentDefaultsDefinition defaults, DocumentDefaultsDefinition parentDefaults, Element root) {

spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java

@@ -34,7 +34,6 @@
 import org.springframework.beans.propertyeditors.InputStreamEditor;
 import org.springframework.beans.propertyeditors.URIEditor;
 import org.springframework.beans.propertyeditors.URLEditor;
-import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ContextResource;
@@ -71,7 +70,7 @@ public class ResourceEditorRegistrar implements PropertyEditorRegistrar {
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.context.ApplicationContext
 	 * @deprecated as of Spring 3.1 in favor of
-	 * {@link #ResourceEditorRegistrar(ResourceLoader, Environment)}
+	 * {@link #ResourceEditorRegistrar(ResourceLoader, PropertyResolver)}
 	 */
 	@Deprecated
 	public ResourceEditorRegistrar(ResourceLoader resourceLoader) {

spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java

@@ -56,9 +56,7 @@
  * @since 3.1
  * @see #setName
  * @see #setGroup
- * @see #setStartTime
- * @see #setJobName
- * @see #setJobGroup
+ * @see #setStartDelay
  * @see #setJobDetail
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java

@@ -56,9 +56,7 @@
  * @since 3.1
  * @see #setName
  * @see #setGroup
- * @see #setStartTime
- * @see #setJobName
- * @see #setJobGroup
+ * @see #setStartDelay
  * @see #setJobDetail
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails

spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java

@@ -41,7 +41,7 @@ public interface CacheAnnotationParser {
 	 * @param ae the annotated method or class
 	 * @return CacheOperation the configured caching operation,
 	 * or {@code null} if none was found
-	 * @see AnnotationCacheOperationSource#determineCacheOperation
+	 * @see AnnotationCacheOperationSource#determineCacheOperations(AnnotatedElement)
 	 */
 	Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae);
 }

spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java

@@ -30,7 +30,7 @@
  * @since 3.1
  * @see EnableCaching
  * @see ProxyCachingConfiguration
- * @see AnnotationConfigUtils.CACHE_ASPECT_CONFIGURATION_CLASS_NAME
+ * @see AnnotationConfigUtils#CACHE_ASPECT_CONFIGURATION_CLASS_NAME
  */
 public class CachingConfigurationSelector extends AdviceModeImportSelector<EnableCaching> {
 

spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java

@@ -163,7 +163,7 @@
 
 	/**
 	 * Indicate how caching advice should be applied. The default is
-	 * {@link AdviceMode.PROXY}.
+	 * {@link AdviceMode#PROXY}.
 	 * @see AdviceMode
 	 */
 	AdviceMode mode() default AdviceMode.PROXY;

spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java

@@ -115,7 +115,7 @@ public void clear() {
 	/**
 	 * Convert the given value from the internal store to a user value
 	 * returned from the get method (adapting <code>null</code>).
-	 * @param userValue the store value
+	 * @param storeValue the store value
 	 * @return the value to return to the user
 	 */
 	protected Object fromStoreValue(Object storeValue) {

spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java

@@ -39,8 +39,8 @@ public class EhCacheCacheManager extends AbstractCacheManager {
 
 
 	/**
-	 * Returns the backing Ehcache {@link net.sf.ehcache.CacheManager}.
-	 * @return
+	 * Returns the backing EhCache {@link net.sf.ehcache.CacheManager}.
+	 * @return the backing EhCache {@link net.sf.ehcache.CacheManager}.
 	 */
 	public net.sf.ehcache.CacheManager getCacheManager() {
 		return cacheManager;

spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java

@@ -44,7 +44,6 @@ protected CacheOperationSource getCacheOperationSource() {
 	 * Set the cache operation attribute source which is used to find cache
 	 * attributes. This should usually be identical to the source reference
 	 * set on the cache interceptor itself.
-	 * @see CacheInterceptor#setCacheAttributeSource
 	 */
 	public void setCacheOperationSource(CacheOperationSource cacheOperationSource) {
 		this.cacheOperationSource = cacheOperationSource;

spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java

@@ -24,7 +24,7 @@
  * Proxy factory bean for simplified declarative caching handling.
  * This is a convenient alternative to a standard AOP
  * {@link org.springframework.aop.framework.ProxyFactoryBean}
- * with a separate {@link CachingInterceptor} definition.
+ * with a separate {@link CacheInterceptor} definition.
  *
  * <p>This class is designed to facilitate declarative cache demarcation: namely, wrapping
  * a singleton target object with a caching proxy, proxying all the interfaces that the
@@ -36,7 +36,7 @@
  *
  * @author Costin Leau
  * @see org.springframework.aop.framework.ProxyFactoryBean
- * @see CachingInterceptor
+ * @see CacheInterceptor
  */
 @SuppressWarnings("serial")
 public class CacheProxyFactoryBean extends AbstractSingletonProxyFactoryBean {

spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java

@@ -50,7 +50,6 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
 	 * (e.g. "myMethod") and CacheOperation instances
 	 * (or Strings to be converted to CacheOperation instances).
 	 * @see CacheOperation
-	 * @see CacheOperationEditor
 	 */
 	public void setNameMap(Map<String, Collection<CacheOperation>> nameMap) {
 		for (Map.Entry<String, Collection<CacheOperation>> entry : nameMap.entrySet()) {

spring-context/src/main/java/org/springframework/context/annotation/Configuration.java

@@ -28,7 +28,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * Indicates that a class declares one or more @{@link Bean} methods and may be processed
+ * Indicates that a class declares one or more {@link Bean @Bean} methods and may be processed
  * by the Spring container to generate bean definitions and service requests for those
  * beans at runtime, for example:
  * <pre class="code">
@@ -76,22 +76,22 @@
  * post processors that facilitate handling {@code @Configuration} classes.
  *
  * <h3>Via component scanning</h3>
- * <p>{@code @Configuration} is meta-annotated with @{@link Component}, therefore
+ * <p>{@code @Configuration} is meta-annotated with {@link Component @Component}, therefore
  * {@code @Configuration} classes are candidates for component scanning (typically using
  * Spring XML's {@code <context:component-scan/>} element) and therefore may also take
- * advantage of @{@link Autowired}/@{@link Inject} at the field and method level (but not
- * at the constructor level).
+ * advantage of {@link Autowired @Autowired}/{@link javax.inject.Inject @Inject}
+ * at the field and method level (but not at the constructor level).
  * <p>{@code @Configuration} classes may not only be bootstrapped using
  * component scanning, but may also themselves <em>configure</em> component scanning using
- * the @{@link ComponentScan} annotation:
+ * the {@link ComponentScan @ComponentScan} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;ComponentScan("com.acme.app.services")
  * public class AppConfig {
  *     // various &#064;Bean definitions ...
  * }</pre>
  *
- * See @{@link ComponentScan} Javadoc for details.
+ * See {@link ComponentScan @ComponentScan} Javadoc for details.
  * 
  *
  * <h2>Working with externalized values</h2>
@@ -115,7 +115,8 @@
  *
  * Properties resolved through the {@code Environment} reside in one or more "property
  * source" objects, and {@code @Configuration} classes may contribute property sources to
- * the {@code Environment} object using the @{@link PropertySources} annotation:
+ * the {@code Environment} object using
+ * the {@link org.springframework.core.env.PropertySources @PropertySources} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;PropertySource("classpath:/com/acme/app.properties")
@@ -129,11 +130,11 @@
  * }</pre>
  *
  * See {@link org.springframework.core.env.Environment Environment}
- * and @{@link PropertySource} Javadoc for further details.
+ * and {@link PropertySource @PropertySource} Javadoc for further details.
  * 
  * <h3>Using the {@code @Value} annotation</h3>
  * Externalized values may be 'wired into' {@code @Configuration} classes using
- * the @{@link Value} annotation:
+ * the {@link Value @Value} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;PropertySource("classpath:/com/acme/app.properties")
@@ -151,13 +152,13 @@
  * PropertySourcesPlaceholderConfigurer}, usually enabled via XML with
  * {@code <context:property-placeholder/>}.  See the section below on composing
  * {@code @Configuration} classes with Spring XML using {@code @ImportResource},
- * see @{@link Value} Javadoc, and see @{@link Bean} Javadoc for details on working with
+ * see {@link Value @Value} Javadoc, and see {@link Bean @Bean} Javadoc for details on working with
  * {@code BeanFactoryPostProcessor} types such as
  * {@code PropertySourcesPlaceholderConfigurer}.
  *
  * <h2>Composing {@code @Configuration} classes</h2>
  * <h3>With the {@code @Import} annotation</h3>
- * <p>{@code @Configuration} classes may be composed using the @{@link Import} annotation,
+ * <p>{@code @Configuration} classes may be composed using the {@link Import @Import} annotation,
  * not unlike the way that {@code <import>} works in Spring XML. Because
  * {@code @Configuration} objects are managed as Spring beans within the container,
  * imported configurations may be injected using {@code @Autowired} or {@code @Inject}:
@@ -189,7 +190,7 @@
  * new AnnotationConfigApplicationContext(AppConfig.class);</pre>
  *
  * <h3>With the {@code @Profile} annotation</h3>
- * {@code @Configuration} classes may be marked with the @{@link Profile} annotation to 
+ * {@code @Configuration} classes may be marked with the {@link Profile @Profile} annotation to 
  * indicate they should be processed only if a given profile or profiles are
  * <em>active</em>:
  * <pre class="code">
@@ -211,14 +212,14 @@
  *     }
  * }</pre>
  *
- * See @{@link Profile} and {@link org.springframework.core.env.Environment Environment}
+ * See {@link Profile @Profile} and {@link org.springframework.core.env.Environment Environment}
  * Javadoc for further details.
  *
  * <h3>With Spring XML using the {@code @ImportResource} annotation</h3>
  * As mentioned above, {@code @Configuration} classes may be declared as regular Spring
  * {@code <bean>} definitions within Spring XML files. It is also possible to
  * import Spring XML configuration files into {@code @Configuration} classes using
- * the @{@link ImportResource} annotation. Bean definitions imported from XML can be
+ * the {@link ImportResource @ImportResource} annotation. Bean definitions imported from XML can be
  * injected using {@code @Autowired} or {@code @Import}:
  * <pre class="code">
  * &#064;Configuration
@@ -267,7 +268,7 @@
  * <h2>Configuring lazy initialization</h2>
  * <p>By default, {@code @Bean} methods will be <em>eagerly instantiated</em> at container
  * bootstrap time.  To avoid this, {@code @Configuration} may be used in conjunction with
- * the @{@link Lazy} annotation to indicate that all {@code @Bean} methods declared within
+ * the {@link Lazy @Lazy} annotation to indicate that all {@code @Bean} methods declared within
  * the class are by default lazily initialized. Note that {@code @Lazy} may be used on
  * individual {@code @Bean} methods as well.
  *
@@ -309,7 +310,7 @@
  *    <li>&#064;Configuration classes must be non-final
  *    <li>&#064;Configuration classes must be non-local (may not be declared within a method)
  *    <li>&#064;Configuration classes must have a default/no-arg constructor and may not
- *        use @{@link Autowired} constructor parameters. Any nested configuration classes
+ *        use {@link Autowired @Autowired} constructor parameters. Any nested configuration classes
  *        must be {@code static}
  * </ul>
  *

spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java

@@ -64,13 +64,13 @@
  * TomcatInstrumentableClassLoader}).
  *
  * <p>To customize the weaver used, the {@code @Configuration} class annotated with
- * {@code @EnableLoadTimeWeaving} may also implement the {@link LoadTimeWeaverConfigurer}
+ * {@code @EnableLoadTimeWeaving} may also implement the {@link LoadTimeWeavingConfigurer}
  * interface and return a custom {@code LoadTimeWeaver} instance through the
  * {@code #getLoadTimeWeaver} method:
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableLoadTimeWeaving
- * public class AppConfig implements LoadTimeWeaverConfigurer {
+ * public class AppConfig implements LoadTimeWeavingConfigurer {
  *     &#064;Override
  *     public LoadTimeWeaver getLoadTimeWeaver() {
  *         MyLoadTimeWeaver ltw = new MyLoadTimeWeaver();

spring-context/src/main/java/org/springframework/context/annotation/FilterType.java

@@ -28,8 +28,8 @@
  * @author Chris Beams
  * @since 2.5
  * @see ComponentScan
- * @see ComponentScan.IncludeFilter
- * @see ComponentScan.ExcludeFilter
+ * @see ComponentScan#includeFilters()
+ * @see ComponentScan#excludeFilters()
  * @see org.springframework.core.type.filter.TypeFilter
  */
 public enum FilterType {

spring-context/src/main/java/org/springframework/context/annotation/Import.java

@@ -23,23 +23,23 @@
 import java.lang.annotation.Target;
 
 /**
- * Indicates one or more @{@link Configuration} classes to import.
+ * Indicates one or more {@link Configuration @Configuration} classes to import.
  *
  * <p>Provides functionality equivalent to the {@code <import/>} element in Spring XML.
  * Only supported for classes annotated with {@code @Configuration} or declaring at least
- * one {@link @Bean} method, as well as {@link ImportSelector} and
+ * one {@link Bean @Bean} method, as well as {@link ImportSelector} and
  * {@link ImportBeanDefinitionRegistrar} implementations.
  *
- * <p>@{@code Bean} definitions declared in imported {@code @Configuration} classes
- * should be accessed by using @{@link Autowired} injection.  Either the bean itself can
- * be autowired, or the configuration class instance declaring the bean can be autowired.
- * The latter approach allows for explicit, IDE-friendly navigation between
- * {@code @Configuration} class methods.
+ * <p>{@code @Bean} definitions declared in imported {@code @Configuration} classes
+ * should be accessed by using {@link org.springframework.beans.factory.annotation.Autowired @Autowired}
+ * injection. Either the bean itself can be autowired, or the configuration class instance
+ * declaring the bean can be autowired. The latter approach allows for explicit,
+ * IDE-friendly navigation between {@code @Configuration} class methods.
  *
  * <p>May be declared at the class level or as a meta-annotation.
  *
  * <p>If XML or other non-{@code @Configuration} bean definition resources need to be
- * imported, use @{@link ImportResource}
+ * imported, use {@link ImportResource @ImportResource}
  *
  * @author Chris Beams
  * @since 3.0