Skip to content

Commit

Permalink
Fix javadoc warnings
Browse files Browse the repository at this point in the history
Before this change there were numerous javadoc warnings being reported
while building Spring framework API.

This commit resolves most of the javadoc warnings, reducing the total
number from 265 to 103.

Issue: SPR-9113
  • Loading branch information
sslavic authored and cbeams committed Apr 30, 2012
1 parent e830511 commit effb762
Show file tree
Hide file tree
Showing 92 changed files with 347 additions and 350 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/** /**
* AOP Alliance <code>MethodInterceptor</code> that processes method invocations * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
* asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}. * 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. * <p>In terms of target method signatures, any parameter types are supported.
* However, the return type is constrained to either <code>void</code> or * However, the return type is constrained to either <code>void</code> or
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -28,8 +28,9 @@
import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory;


/** /**
* Base class for dynamic {@link TargetSource} implementations that create new prototype * Base class for dynamic {@link org.springframework.aop.TargetSource} implementations
* bean instances to support a pooling or new-instance-per-invocation strategy. * 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 * <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. * call the <code>getBean</code> method to create a new prototype instance.
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -31,7 +31,7 @@
* @author Chris Beams * @author Chris Beams
* @since 3.1 * @since 3.1
* @see EnableAsync * @see EnableAsync
* @see AsyncConfigurationSelector * @see org.springframework.scheduling.annotation.AsyncConfigurationSelector
*/ */
@Configuration @Configuration
public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration { public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -39,7 +39,7 @@
* a special case of such a general config method. Such config methods * a special case of such a general config method. Such config methods
* do not have to be public. * do not have to be public.
* *
* <p>In the case of multiple argument methods, the 'required' parameter is * <p>In the case of multiple argument methods, the 'required' parameter is
* applicable for all arguments. * applicable for all arguments.
* *
* <p>In case of a {@link java.util.Collection} or {@link java.util.Map} * <p>In case of a {@link java.util.Collection} or {@link java.util.Map}
Expand All @@ -52,8 +52,9 @@
* BeanPostProcessor} which in turn means that you <em>cannot</em> * BeanPostProcessor} which in turn means that you <em>cannot</em>
* use {@code @Autowired} to inject references into * use {@code @Autowired} to inject references into
* {@link org.springframework.beans.factory.config.BeanPostProcessor * {@link org.springframework.beans.factory.config.BeanPostProcessor
* BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please * BeanPostProcessor} or
* consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor} * {@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). * class (which, by default, checks for the presence of this annotation).
* *
* @author Juergen Hoeller * @author Juergen Hoeller
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -37,8 +37,9 @@
* BeanPostProcessor} which in turn means that you <em>cannot</em> use * BeanPostProcessor} which in turn means that you <em>cannot</em> use
* {@code @Value} within * {@code @Value} within
* {@link org.springframework.beans.factory.config.BeanPostProcessor * {@link org.springframework.beans.factory.config.BeanPostProcessor
* BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please * BeanPostProcessor} or
* consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor} * {@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). * class (which, by default, checks for the presence of this annotation).
* *
* @author Juergen Hoeller * @author Juergen Hoeller
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -36,8 +36,8 @@
* *
*<pre class="code">{@code *<pre class="code">{@code
*<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/> *<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/>
* <property name="driverClassName" value="}${driver}{@code"/> * <property name="driverClassName" value="}${driver}{@code "/>
* <property name="url" value="jdbc:}${dbname}{@code"/> * <property name="url" value="jdbc:}${dbname}{@code "/>
*</bean> *</bean>
*}</pre> *}</pre>
* *
Expand Down Expand Up @@ -76,7 +76,7 @@
* <p>Example XML property with default value: * <p>Example XML property with default value:
* *
*<pre class="code">{@code *<pre class="code">{@code
* <property name="url" value="jdbc:}${dbname:defaultdb}{@code"/> * <property name="url" value="jdbc:}${dbname:defaultdb}{@code "/>
*}</pre> *}</pre>
* *
* @author Chris Beams * @author Chris Beams
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -353,7 +353,7 @@ public void initDefaults(Element root) {
* <literal>parentDefaults</literal> in case the defaults are not explicitly set * <literal>parentDefaults</literal> in case the defaults are not explicitly set
* locally. * locally.
* @param defaults the defaults to populate * @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) * @param root the root element of the current bean definition document (or nested beans element)
*/ */
protected void populateDefaults(DocumentDefaultsDefinition defaults, DocumentDefaultsDefinition parentDefaults, Element root) { protected void populateDefaults(DocumentDefaultsDefinition defaults, DocumentDefaultsDefinition parentDefaults, Element root) {
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -34,7 +34,6 @@
import org.springframework.beans.propertyeditors.InputStreamEditor; import org.springframework.beans.propertyeditors.InputStreamEditor;
import org.springframework.beans.propertyeditors.URIEditor; import org.springframework.beans.propertyeditors.URIEditor;
import org.springframework.beans.propertyeditors.URLEditor; import org.springframework.beans.propertyeditors.URLEditor;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertyResolver; import org.springframework.core.env.PropertyResolver;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ContextResource; import org.springframework.core.io.ContextResource;
Expand Down Expand Up @@ -71,7 +70,7 @@ public class ResourceEditorRegistrar implements PropertyEditorRegistrar {
* @see org.springframework.core.io.support.ResourcePatternResolver * @see org.springframework.core.io.support.ResourcePatternResolver
* @see org.springframework.context.ApplicationContext * @see org.springframework.context.ApplicationContext
* @deprecated as of Spring 3.1 in favor of * @deprecated as of Spring 3.1 in favor of
* {@link #ResourceEditorRegistrar(ResourceLoader, Environment)} * {@link #ResourceEditorRegistrar(ResourceLoader, PropertyResolver)}
*/ */
@Deprecated @Deprecated
public ResourceEditorRegistrar(ResourceLoader resourceLoader) { public ResourceEditorRegistrar(ResourceLoader resourceLoader) {
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -56,9 +56,7 @@
* @since 3.1 * @since 3.1
* @see #setName * @see #setName
* @see #setGroup * @see #setGroup
* @see #setStartTime * @see #setStartDelay
* @see #setJobName
* @see #setJobGroup
* @see #setJobDetail * @see #setJobDetail
* @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
* @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -56,9 +56,7 @@
* @since 3.1 * @since 3.1
* @see #setName * @see #setName
* @see #setGroup * @see #setGroup
* @see #setStartTime * @see #setStartDelay
* @see #setJobName
* @see #setJobGroup
* @see #setJobDetail * @see #setJobDetail
* @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
* @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -41,7 +41,7 @@ public interface CacheAnnotationParser {
* @param ae the annotated method or class * @param ae the annotated method or class
* @return CacheOperation the configured caching operation, * @return CacheOperation the configured caching operation,
* or {@code null} if none was found * or {@code null} if none was found
* @see AnnotationCacheOperationSource#determineCacheOperation * @see AnnotationCacheOperationSource#determineCacheOperations(AnnotatedElement)
*/ */
Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae); Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae);
} }
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -30,7 +30,7 @@
* @since 3.1 * @since 3.1
* @see EnableCaching * @see EnableCaching
* @see ProxyCachingConfiguration * @see ProxyCachingConfiguration
* @see AnnotationConfigUtils.CACHE_ASPECT_CONFIGURATION_CLASS_NAME * @see AnnotationConfigUtils#CACHE_ASPECT_CONFIGURATION_CLASS_NAME
*/ */
public class CachingConfigurationSelector extends AdviceModeImportSelector<EnableCaching> { public class CachingConfigurationSelector extends AdviceModeImportSelector<EnableCaching> {


Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -163,7 +163,7 @@


/** /**
* Indicate how caching advice should be applied. The default is * Indicate how caching advice should be applied. The default is
* {@link AdviceMode.PROXY}. * {@link AdviceMode#PROXY}.
* @see AdviceMode * @see AdviceMode
*/ */
AdviceMode mode() default AdviceMode.PROXY; AdviceMode mode() default AdviceMode.PROXY;
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -115,7 +115,7 @@ public void clear() {
/** /**
* Convert the given value from the internal store to a user value * Convert the given value from the internal store to a user value
* returned from the get method (adapting <code>null</code>). * 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 * @return the value to return to the user
*/ */
protected Object fromStoreValue(Object storeValue) { protected Object fromStoreValue(Object storeValue) {
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -39,8 +39,8 @@ public class EhCacheCacheManager extends AbstractCacheManager {




/** /**
* Returns the backing Ehcache {@link net.sf.ehcache.CacheManager}. * Returns the backing EhCache {@link net.sf.ehcache.CacheManager}.
* @return * @return the backing EhCache {@link net.sf.ehcache.CacheManager}.
*/ */
public net.sf.ehcache.CacheManager getCacheManager() { public net.sf.ehcache.CacheManager getCacheManager() {
return cacheManager; return cacheManager;
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 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.
Expand Down Expand Up @@ -44,7 +44,6 @@ protected CacheOperationSource getCacheOperationSource() {
* Set the cache operation attribute source which is used to find cache * Set the cache operation attribute source which is used to find cache
* attributes. This should usually be identical to the source reference * attributes. This should usually be identical to the source reference
* set on the cache interceptor itself. * set on the cache interceptor itself.
* @see CacheInterceptor#setCacheAttributeSource
*/ */
public void setCacheOperationSource(CacheOperationSource cacheOperationSource) { public void setCacheOperationSource(CacheOperationSource cacheOperationSource) {
this.cacheOperationSource = cacheOperationSource; this.cacheOperationSource = cacheOperationSource;
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2011 the original author or authors. * Copyright 2010-2012 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.
Expand All @@ -24,7 +24,7 @@
* Proxy factory bean for simplified declarative caching handling. * Proxy factory bean for simplified declarative caching handling.
* This is a convenient alternative to a standard AOP * This is a convenient alternative to a standard AOP
* {@link org.springframework.aop.framework.ProxyFactoryBean} * {@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 * <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 * a singleton target object with a caching proxy, proxying all the interfaces that the
Expand All @@ -36,7 +36,7 @@
* *
* @author Costin Leau * @author Costin Leau
* @see org.springframework.aop.framework.ProxyFactoryBean * @see org.springframework.aop.framework.ProxyFactoryBean
* @see CachingInterceptor * @see CacheInterceptor
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class CacheProxyFactoryBean extends AbstractSingletonProxyFactoryBean { public class CacheProxyFactoryBean extends AbstractSingletonProxyFactoryBean {
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
* (e.g. "myMethod") and CacheOperation instances * (e.g. "myMethod") and CacheOperation instances
* (or Strings to be converted to CacheOperation instances). * (or Strings to be converted to CacheOperation instances).
* @see CacheOperation * @see CacheOperation
* @see CacheOperationEditor
*/ */
public void setNameMap(Map<String, Collection<CacheOperation>> nameMap) { public void setNameMap(Map<String, Collection<CacheOperation>> nameMap) {
for (Map.Entry<String, Collection<CacheOperation>> entry : nameMap.entrySet()) { for (Map.Entry<String, Collection<CacheOperation>> entry : nameMap.entrySet()) {
Expand Down
Loading

0 comments on commit effb762

Please sign in to comment.