From a31ac882c54b9a32345274b09647b7423ecf0839 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 26 Nov 2013 13:24:19 -0800 Subject: [PATCH] Fix various javadoc warnings --- build.gradle | 5 +- .../config/CustomEditorConfigurer.java | 2 - .../propertyeditors/CustomBooleanEditor.java | 4 +- .../propertyeditors/CustomDateEditor.java | 4 +- .../propertyeditors/CustomNumberEditor.java | 4 +- .../propertyeditors/StringTrimmerEditor.java | 1 - .../beans/support/MutableSortDefinition.java | 2 +- .../FreeMarkerConfigurationFactory.java | 1 - .../ui/velocity/VelocityEngineFactory.java | 5 +- .../LoadTimeWeavingConfiguration.java | 2 +- .../annotation/MBeanExportConfiguration.java | 2 +- .../glassfish/GlassFishLoadTimeWeaver.java | 2 +- .../classloading/tomcat/package-info.java | 3 -- .../validation/AbstractBindingResult.java | 6 +-- .../validation/BindingResult.java | 1 - .../java/org/springframework/asm/Label.java | 36 +++++++-------- .../springframework/core/ResolvableType.java | 2 +- .../springframework/util/AntPathMatcher.java | 4 +- .../util/InvalidMimeTypeException.java | 2 +- .../org/springframework/util/MimeType.java | 20 ++++---- .../springframework/util/MimeTypeUtils.java | 46 +++++++++---------- .../util/concurrent/FutureAdapter.java | 2 +- .../util/concurrent/ListenableFuture.java | 3 +- .../concurrent/ListenableFutureAdapter.java | 2 +- .../ListenableFutureCallbackRegistry.java | 4 +- .../classloading/tomcat/package-info.java | 8 ---- .../springframework/jms/core/JmsTemplate.java | 4 +- .../jms/core/support/JmsGatewaySupport.java | 3 +- .../core/AbstractMessageSendingTemplate.java | 2 +- ...tractNamedValueMethodArgumentResolver.java | 29 ++++++------ .../DefaultUserDestinationResolver.java | 2 +- .../handler/DefaultUserSessionRegistry.java | 2 +- .../oxm/jaxb/Jaxb2Marshaller.java | 3 +- .../mock/web/MockServletContext.java | 4 +- .../RunAfterTestClassCallbacks.java | 1 + .../RunAfterTestMethodCallbacks.java | 1 + .../DirtiesContextTestExecutionListener.java | 4 +- .../dao/support/DaoSupport.java | 1 - .../TransactionProxyFactoryBean.java | 3 +- .../http/StreamingHttpOutputMessage.java | 6 +-- .../converter/FormHttpMessageConverter.java | 2 +- ...pComponentsHttpInvokerRequestExecutor.java | 2 +- .../HttpInvokerClientInterceptor.java | 4 +- .../web/bind/ServletRequestDataBinder.java | 6 --- .../web/bind/annotation/RequestMapping.java | 2 +- .../support/WebApplicationContextUtils.java | 1 - .../bind/PortletRequestDataBinder.java | 6 --- .../annotation/MvcUriComponentsBuilder.java | 2 +- .../messaging/StompSubProtocolHandler.java | 3 +- .../config/WebSocketConfigurationSupport.java | 2 +- .../support/WebSocketHttpRequestHandler.java | 4 -- .../handler/TransportHandlerSupport.java | 2 +- 52 files changed, 112 insertions(+), 162 deletions(-) delete mode 100644 spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java diff --git a/build.gradle b/build.gradle index ee59933d03..120979a964 100644 --- a/build.gradle +++ b/build.gradle @@ -93,8 +93,9 @@ configure(allprojects) { project -> "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", "http://ehcache.org/apidocs/", "http://quartz-scheduler.org/api/2.1.7/", - "http://jackson.codehaus.org/1.9.12/javadoc/", - "http://fasterxml.github.com/jackson-core/javadoc/2.2.2/", + "http://jackson.codehaus.org/1.9.4/javadoc/", + "http://fasterxml.github.com/jackson-core/javadoc/2.2.0/", + "http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs" ] as String[] } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index 2681fd7c32..a0dafe9631 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -91,8 +91,6 @@ import org.springframework.util.ClassUtils; * @see ConfigurableBeanFactory#addPropertyEditorRegistrar * @see ConfigurableBeanFactory#registerCustomEditor * @see org.springframework.validation.DataBinder#registerCustomEditor - * @see org.springframework.web.servlet.mvc.BaseCommandController#setPropertyEditorRegistrars - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, Ordered { diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java index 985ba1723c..8b1243546b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java @@ -29,13 +29,11 @@ import org.springframework.util.StringUtils; * them in the UI form. * *

In web MVC code, this editor will typically be registered with - * {@code binder.registerCustomEditor} calls in an implementation - * of BaseCommandController's {@code initBinder} method. + * {@code binder.registerCustomEditor} calls. * * @author Juergen Hoeller * @since 10.06.2003 * @see org.springframework.validation.DataBinder#registerCustomEditor - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class CustomBooleanEditor extends PropertyEditorSupport { diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java index 36718b20e9..674e7422fe 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java @@ -33,15 +33,13 @@ import org.springframework.util.StringUtils; * and rendering them in the UI form. * *

In web MVC code, this editor will typically be registered with - * {@code binder.registerCustomEditor} calls in a custom - * {@code initBinder} method. + * {@code binder.registerCustomEditor}. * * @author Juergen Hoeller * @since 28.04.2003 * @see java.util.Date * @see java.text.DateFormat * @see org.springframework.validation.DataBinder#registerCustomEditor - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class CustomDateEditor extends PropertyEditorSupport { diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java index c946c621fb..890788c353 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java @@ -34,15 +34,13 @@ import org.springframework.util.StringUtils; * and rendering them in the UI form. * *

In web MVC code, this editor will typically be registered with - * {@code binder.registerCustomEditor} calls in a custom - * {@code initBinder} method. + * {@code binder.registerCustomEditor} calls. * * @author Juergen Hoeller * @since 06.06.2003 * @see Number * @see java.text.NumberFormat * @see org.springframework.validation.DataBinder#registerCustomEditor - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class CustomNumberEditor extends PropertyEditorSupport { diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java index da9c1eea94..c61ff722d7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java @@ -28,7 +28,6 @@ import org.springframework.util.StringUtils; * * @author Juergen Hoeller * @see org.springframework.validation.DataBinder#registerCustomEditor - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class StringTrimmerEditor extends PropertyEditorSupport { diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java index 4f59e4d30e..0477554847 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java @@ -146,7 +146,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable { /** * Return whether to toggle the ascending flag if the same property gets set again - * (that is, {@link #setProperty} gets called with already set property name again). + * (that is, {@code setProperty} gets called with already set property name again). */ public boolean isToggleAscendingOnProperty() { return this.toggleAscendingOnProperty; diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java index fdadc8ac02..1b4e7bd1a1 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java +++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java @@ -194,7 +194,6 @@ public class FreeMarkerConfigurationFactory { * @see org.springframework.context.ApplicationContext#getResource * @see freemarker.template.Configuration#setDirectoryForTemplateLoading * @see SpringTemplateLoader - * @see #setTemplateLoaders */ public void setTemplateLoaderPaths(String... templateLoaderPaths) { this.templateLoaderPaths = templateLoaderPaths; diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java index 31dd8ef513..1892533098 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java +++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java @@ -53,8 +53,8 @@ import org.springframework.util.StringUtils; * to the Spring application context. * *

If "overrideLogging" is true (the default), the VelocityEngine will be - * configured to log via Commons Logging, that is, using the Spring-provided - * {@link CommonsLoggingLogSystem} as log system. + * configured to log via Commons Logging, that is, using + * {@link CommonsLogLogChute} as log system. * *

The simplest way to use this class is to specify a * {@link #setResourceLoaderPath(String) "resourceLoaderPath"}; the @@ -66,7 +66,6 @@ import org.springframework.util.StringUtils; * @see #setResourceLoaderPath * @see #setOverrideLogging * @see #createVelocityEngine - * @see CommonsLoggingLogSystem * @see VelocityEngineFactoryBean * @see org.springframework.web.servlet.view.velocity.VelocityConfigurer * @see org.apache.velocity.app.VelocityEngine diff --git a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java index c7935a547d..6b4ab8dd41 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java @@ -34,7 +34,7 @@ import static org.springframework.context.weaving.AspectJWeavingEnabler.*; * {@code @Configuration} class that registers a {@link LoadTimeWeaver} bean. * *

This configuration class is automatically imported when using the - * @{@link EnableLoadTimeWeaving} annotation. See {@code @EnableLoadTimeWeaving} + * {@link EnableLoadTimeWeaving} annotation. See {@code @EnableLoadTimeWeaving} * javadoc for complete usage details. * * @author Chris Beams diff --git a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java index e4f1f1bbb0..573b14e9f8 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * {@code @Configuration} class that registers a {@link AnnotationMBeanExporter} bean. * *

This configuration class is automatically imported when using the - * @{@link EnableMBeanExport} annotation. See its javadoc for complete usage details. + * {@link EnableMBeanExport} annotation. See its javadoc for complete usage details. * * @author Phillip Webb * @author Chris Beams diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java index 5070049af8..81222f3f5e 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java @@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils; /** * {@link LoadTimeWeaver} implementation for GlassFish's - * {@link org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}. + * {@code org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}. * *

As of Spring 4.0, this weaver supports GlassFish V3 and V4. * diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java index e724bb2d42..ffe30f6051 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java @@ -1,8 +1,5 @@ - /** - * * Support for class instrumentation on Tomcat. - * */ package org.springframework.instrument.classloading.tomcat; diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java index 5d33eb37ec..9e162d13ca 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java @@ -262,15 +262,11 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi * Adding things to the map and then re-calling this method will not work. *

The attributes in the model Map returned by this method are usually * included in the ModelAndView for a form view that uses Spring's bind tag, - * which needs access to the Errors instance. Spring's SimpleFormController - * will do this for you when rendering its form or success view. When - * building the ModelAndView yourself, you need to include the attributes - * from the model Map returned by this method yourself. + * which needs access to the Errors instance. * @see #getObjectName * @see #MODEL_KEY_PREFIX * @see org.springframework.web.servlet.ModelAndView * @see org.springframework.web.servlet.tags.BindTag - * @see org.springframework.web.servlet.mvc.SimpleFormController */ @Override public Map getModel() { diff --git a/spring-context/src/main/java/org/springframework/validation/BindingResult.java b/spring-context/src/main/java/org/springframework/validation/BindingResult.java index 1ee5b66774..32c93215cb 100644 --- a/spring-context/src/main/java/org/springframework/validation/BindingResult.java +++ b/spring-context/src/main/java/org/springframework/validation/BindingResult.java @@ -73,7 +73,6 @@ public interface BindingResult extends Errors { * @see #MODEL_KEY_PREFIX * @see org.springframework.web.servlet.ModelAndView * @see org.springframework.web.servlet.tags.BindTag - * @see org.springframework.web.servlet.mvc.SimpleFormController */ Map getModel(); diff --git a/spring-core/src/main/java/org/springframework/asm/Label.java b/spring-core/src/main/java/org/springframework/asm/Label.java index 5eb3e62227..b0e97cb34f 100644 --- a/spring-core/src/main/java/org/springframework/asm/Label.java +++ b/spring-core/src/main/java/org/springframework/asm/Label.java @@ -35,7 +35,7 @@ package org.springframework.asm; * designates the instruction that is just after. Note however that there * can be other elements between a label and the instruction it designates (such * as other labels, stack map frames, line numbers, etc.). - * + * * @author Eric Bruneton */ public class Label { @@ -111,13 +111,13 @@ public class Label { * Field used to associate user information to a label. Warning: this field * is used by the ASM tree package. In order to use it with the ASM tree * package you must override the - * {@link org.objectweb.asm.tree.MethodNode#getLabelNode} method. + * {@code org.objectweb.asm.tree.MethodNode#getLabelNode} method. */ public Object info; /** * Flags that indicate the status of this label. - * + * * @see #DEBUG * @see #RESOLVED * @see #RESIZED @@ -170,7 +170,7 @@ public class Label { * represented by the Label object that corresponds to the first instruction * of this basic block. Each node also stores the list of its successors in * the graph, as a linked list of Edge objects. - * + * * The control flow analysis algorithms used to compute the maximum stack * size or the stack map frames are similar and use two steps. The first * step, during the visit of each instruction, builds information about the @@ -182,7 +182,7 @@ public class Label { * information about the input frame of each basic block, from the input * state of the first basic block (known from the method signature), and by * the using the previously computed relative output frames. - * + * * The algorithm used to compute the maximum stack size only computes the * relative output and absolute input stack heights, while the algorithm * used to compute stack map frames computes relative output frames and @@ -192,10 +192,10 @@ public class Label { /** * Start of the output stack relatively to the input stack. The exact * semantics of this field depends on the algorithm that is used. - * + * * When only the maximum stack size is computed, this field is the number of * elements in the input stack. - * + * * When the stack map frames are completely computed, this field is the * offset of the first output stack element relatively to the top of the * input stack. This offset is always negative or null. A null offset means @@ -240,7 +240,7 @@ public class Label { * main loop of the fix point algorithm used in the second step of the * control flow analysis algorithms. It is also used in * {@link #visitSubroutine} to avoid using a recursive method. - * + * * @see MethodWriter#visitMaxs */ Label next; @@ -264,7 +264,7 @@ public class Label { * from the start of the method's bytecode. This method is intended for * {@link Attribute} sub classes, and is normally not needed by class * generators or adapters. - * + * * @return the offset corresponding to this label. * @throws IllegalStateException * if this label is not resolved yet. @@ -282,7 +282,7 @@ public class Label { * position of the label is known, the offset is computed and written * directly. Otherwise, a null offset is written and a new forward reference * is declared for this label. - * + * * @param owner * the code writer that calls this method. * @param out @@ -320,7 +320,7 @@ public class Label { * for a true forward reference, i.e. only if this label is not resolved * yet. For backward references, the offset of the reference can be, and * must be, computed and stored directly. - * + * * @param sourcePosition * the position of the referencing instruction. This position * will be used to compute the offset of this forward reference. @@ -348,7 +348,7 @@ public class Label { * when this label is added to the bytecode of the method, i.e. when its * position becomes known. This method fills in the blanks that where left * in the bytecode by each forward reference previously added to this label. - * + * * @param owner * the code writer that calls this method. * @param position @@ -416,7 +416,7 @@ public class Label { * isolated label or for the first label in a series of successive labels, * this method returns the label itself. For other labels it returns the * first label of the series. - * + * * @return the first label of the series to which this label belongs. */ Label getFirst() { @@ -429,7 +429,7 @@ public class Label { /** * Returns true is this basic block belongs to the given subroutine. - * + * * @param id * a subroutine id. * @return true is this basic block belongs to the given subroutine. @@ -444,7 +444,7 @@ public class Label { /** * Returns true if this basic block and the given one belong to a common * subroutine. - * + * * @param block * another basic block. * @return true if this basic block and the given one belong to a common @@ -464,7 +464,7 @@ public class Label { /** * Marks this basic block as belonging to the given subroutine. - * + * * @param id * a subroutine id. * @param nbSubroutines @@ -483,7 +483,7 @@ public class Label { * blocks as belonging to this subroutine. This method follows the control * flow graph to find all the blocks that are reachable from the current * block WITHOUT following any JSR target. - * + * * @param JSR * a JSR block that jumps to this subroutine. If this JSR is not * null it is added to the successor of the RET blocks found in @@ -550,7 +550,7 @@ public class Label { /** * Returns a string representation of this label. - * + * * @return a string representation of this label. */ @Override diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index bc9396a6a6..280d20e459 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -103,7 +103,7 @@ public final class ResolvableType implements Serializable { private TypeProvider typeProvider; /** - * The {@link VariableResolver} to use or {@code null} if no resolver is available. + * The {@code VariableResolver} to use or {@code null} if no resolver is available. */ private final VariableResolver variableResolver; diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java index a4d5779e4c..1021a8fceb 100644 --- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java +++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java @@ -261,8 +261,8 @@ public class AntPathMatcher implements PathMatcher { /** * Build or retrieve an {@link AntPathStringMatcher} for the given pattern. *

The default implementation checks this AntPathMatcher's internal cache - * (see {@link #setCachePatterns}, creating a new AntPathStringMatcher instance - * through {@link AntPathStringMatcher#AntPathStringMatcher(String)} if none found. + * (see {@link #setCachePatterns}), creating a new AntPathStringMatcher instance + * if no cached copy is found. * When encountering too many patterns to cache at runtime (the threshold is 65536), * it turns the default cache off, assuming that arbitrary permutations of patterns * are coming in, with little chance for encountering a reoccurring pattern. diff --git a/spring-core/src/main/java/org/springframework/util/InvalidMimeTypeException.java b/spring-core/src/main/java/org/springframework/util/InvalidMimeTypeException.java index f616b99fbf..7eff662059 100644 --- a/spring-core/src/main/java/org/springframework/util/InvalidMimeTypeException.java +++ b/spring-core/src/main/java/org/springframework/util/InvalidMimeTypeException.java @@ -17,7 +17,7 @@ package org.springframework.util; /** - * Exception thrown from {@link MediaType#parseMimeType(String)} in case of + * Exception thrown from {@link MimeTypeUtils#parseMimeType(String)} in case of * encountering an invalid content type specification String. * * @author Juergen Hoeller diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java index eb5fb4cf53..b8a7f337b0 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeType.java +++ b/spring-core/src/main/java/org/springframework/util/MimeType.java @@ -33,17 +33,15 @@ import java.util.TreeSet; * other Internet protocols including HTTP. This class however does not contain support * the q-parameters used in HTTP content negotiation. Those can be found in the sub-class * {@code org.springframework.http.MediaType} in the {@code spring-web} module. - *

- * Consists of a {@linkplain #getType() type} and a {@linkplain #getSubtype() subtype}. + * + *

Consists of a {@linkplain #getType() type} and a {@linkplain #getSubtype() subtype}. * Also has functionality to parse media types from a string using - * {@link #parseMimeType(String)}, or multiple comma-separated media types using - * {@link #parseMimeTypes(String)}. + * {@link #valueOf(String)}. For more parsing options see {@link MimeTypeUtils}. * * @author Arjen Poutsma * @author Juergen Hoeller * @author Rossen Stoyanchev * @since 4.0 - * * @see MimeTypeUtils */ public class MimeType implements Comparable, Serializable { @@ -324,10 +322,12 @@ public class MimeType implements Comparable, Serializable { /** * Indicate whether this {@code MediaType} is compatible with the given media type. - *

For instance, {@code text/*} is compatible with {@code text/plain}, {@code text/html}, and vice versa. - * In effect, this method is similar to {@link #includes(MediaType)}, except that it is symmetric. + *

For instance, {@code text/*} is compatible with {@code text/plain}, + * {@code text/html}, and vice versa. In effect, this method is similar to + * {@link #includes}, except that it is symmetric. * @param other the reference media type with which to compare - * @return {@code true} if this media type is compatible with the given media type; {@code false} otherwise + * @return {@code true} if this media type is compatible with the given media type; + * {@code false} otherwise */ public boolean isCompatibleWith(MimeType other) { if (other == null) { @@ -369,7 +369,7 @@ public class MimeType implements Comparable, Serializable { /** * Compares this {@code MediaType} to another alphabetically. * @param other media type to compare to - * @see #sortBySpecificity(List) + * @see MimeTypeUtils#sortBySpecificity(List) */ @Override public int compareTo(MimeType other) { @@ -459,7 +459,7 @@ public class MimeType implements Comparable, Serializable { * Parse the given String value into a {@code MimeType} object, * with this method name following the 'valueOf' naming convention * (as supported by {@link org.springframework.core.convert.ConversionService}. - * @see #parseMimeType(String) + * @see MimeTypeUtils#parseMimeType(String) */ public static MimeType valueOf(String value) { return MimeTypeUtils.parseMimeType(value); diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java index a57d59cb69..750e2232c6 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java +++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java @@ -28,15 +28,13 @@ import java.util.Map; import org.springframework.util.MimeType.SpecificityComparator; - - /** * * @author Arjen Poutsma * @author Rossen Stoyanchev * @since 4.0 */ -public class MimeTypeUtils { +public abstract class MimeTypeUtils { /** * Public constant mime type that includes all media ranges (i.e. "*/*"). @@ -44,7 +42,7 @@ public class MimeTypeUtils { public static final MimeType ALL; /** - * A String equivalent of {@link MediaType#ALL}. + * A String equivalent of {@link MimeTypeUtils#ALL}. */ public static final String ALL_VALUE = "*/*"; @@ -54,7 +52,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_ATOM_XML; /** - * A String equivalent of {@link MimeType#APPLICATION_ATOM_XML}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_ATOM_XML}. */ public final static String APPLICATION_ATOM_XML_VALUE = "application/atom+xml"; @@ -64,7 +62,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_FORM_URLENCODED; /** - * A String equivalent of {@link MimeType#APPLICATION_FORM_URLENCODED}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_FORM_URLENCODED}. */ public final static String APPLICATION_FORM_URLENCODED_VALUE = "application/x-www-form-urlencoded"; @@ -74,7 +72,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_JSON; /** - * A String equivalent of {@link MimeType#APPLICATION_JSON}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_JSON}. */ public final static String APPLICATION_JSON_VALUE = "application/json"; @@ -84,7 +82,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_OCTET_STREAM; /** - * A String equivalent of {@link MimeType#APPLICATION_OCTET_STREAM}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_OCTET_STREAM}. */ public final static String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream"; @@ -94,7 +92,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_XHTML_XML; /** - * A String equivalent of {@link MimeType#APPLICATION_XHTML_XML}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_XHTML_XML}. */ public final static String APPLICATION_XHTML_XML_VALUE = "application/xhtml+xml"; @@ -104,7 +102,7 @@ public class MimeTypeUtils { public final static MimeType APPLICATION_XML; /** - * A String equivalent of {@link MimeType#APPLICATION_XML}. + * A String equivalent of {@link MimeTypeUtils#APPLICATION_XML}. */ public final static String APPLICATION_XML_VALUE = "application/xml"; @@ -114,7 +112,7 @@ public class MimeTypeUtils { public final static MimeType IMAGE_GIF; /** - * A String equivalent of {@link MimeType#IMAGE_GIF}. + * A String equivalent of {@link MimeTypeUtils#IMAGE_GIF}. */ public final static String IMAGE_GIF_VALUE = "image/gif"; @@ -124,7 +122,7 @@ public class MimeTypeUtils { public final static MimeType IMAGE_JPEG; /** - * A String equivalent of {@link MimeType#IMAGE_JPEG}. + * A String equivalent of {@link MimeTypeUtils#IMAGE_JPEG}. */ public final static String IMAGE_JPEG_VALUE = "image/jpeg"; @@ -134,7 +132,7 @@ public class MimeTypeUtils { public final static MimeType IMAGE_PNG; /** - * A String equivalent of {@link MimeType#IMAGE_PNG}. + * A String equivalent of {@link MimeTypeUtils#IMAGE_PNG}. */ public final static String IMAGE_PNG_VALUE = "image/png"; @@ -144,7 +142,7 @@ public class MimeTypeUtils { public final static MimeType MULTIPART_FORM_DATA; /** - * A String equivalent of {@link MimeType#MULTIPART_FORM_DATA}. + * A String equivalent of {@link MimeTypeUtils#MULTIPART_FORM_DATA}. */ public final static String MULTIPART_FORM_DATA_VALUE = "multipart/form-data"; @@ -154,7 +152,7 @@ public class MimeTypeUtils { public final static MimeType TEXT_HTML; /** - * A String equivalent of {@link MimeType#TEXT_HTML}. + * A String equivalent of {@link MimeTypeUtils#TEXT_HTML}. */ public final static String TEXT_HTML_VALUE = "text/html"; @@ -164,7 +162,7 @@ public class MimeTypeUtils { public final static MimeType TEXT_PLAIN; /** - * A String equivalent of {@link MimeType#TEXT_PLAIN}. + * A String equivalent of {@link MimeTypeUtils#TEXT_PLAIN}. */ public final static String TEXT_PLAIN_VALUE = "text/plain"; @@ -174,7 +172,7 @@ public class MimeTypeUtils { public final static MimeType TEXT_XML; /** - * A String equivalent of {@link MimeType#TEXT_XML}. + * A String equivalent of {@link MimeTypeUtils#TEXT_XML}. */ public final static String TEXT_XML_VALUE = "text/xml"; @@ -294,16 +292,16 @@ public class MimeTypeUtils { *

* Given two mime types: *

    - *
  1. if either mime type has a {@linkplain #isWildcardType() wildcard type}, then - * the mime type without the wildcard is ordered before the other.
    2. - *
  2. if the two mime types have different {@linkplain #getType() types}, then - * they are considered equal and remain their current order.
    3. - *
  3. if either mime type has a {@linkplain #isWildcardSubtype() wildcard subtype} + *
  4. if either mime type has a {@linkplain MimeType#isWildcardType() wildcard type}, + * then the mime type without the wildcard is ordered before the other.
    5. + *
  5. if the two mime types have different {@linkplain MimeType#getType() types}, + * then they are considered equal and remain their current order.
    6. + *
  6. if either mime type has a {@linkplain MimeType#isWildcardSubtype() wildcard subtype} * , then the mime type without the wildcard is sorted before the other.
    7. - *
  7. if the two mime types have different {@linkplain #getSubtype() subtypes}, + *
  8. if the two mime types have different {@linkplain MimeType#getSubtype() subtypes}, * then they are considered equal and remain their current order.
    9. *
  9. if the two mime types have a different amount of - * {@linkplain #getParameter(String) parameters}, then the mime type with the most + * {@linkplain MimeType#getParameter(String) parameters}, then the mime type with the most * parameters is ordered before the other.
    10. *
*

diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java index fe0e7f03dd..dce6143963 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java @@ -26,7 +26,7 @@ import org.springframework.util.Assert; /** * Abstract class that adapts a {@link Future} parameterized over S into a {@code * Future} parameterized over T. All methods are delegated to the adaptee, where {@link - * #get()} and {@link #get(long, TimeUnit)} call {@@link #adapt(Object)} on the adaptee's + * #get()} and {@link #get(long, TimeUnit)} call {@link #adapt(Object)} on the adaptee's * result. * * @param the type of this {@code Future} diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java index 5e5ae00562..f95b48c0a4 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java @@ -22,7 +22,7 @@ import java.util.concurrent.Future; * Extends the {@link Future} interface with the capability to accept completion * callbacks. If the future has already completed when the callback is added, the * callback will be triggered immediately. - *

Inspired by {@link com.google.common.util.concurrent.ListenableFuture}. + *

Inspired by {@code com.google.common.util.concurrent.ListenableFuture}. * @author Arjen Poutsma * @since 4.0 @@ -33,7 +33,6 @@ public interface ListenableFuture extends Future { * Registers the given callback to this {@code ListenableFuture}. The callback will * be triggered when this {@code Future} is complete or, if it is already complete, * immediately. - * * @param callback the callback to register */ void addCallback(ListenableFutureCallback callback); diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java index 8ac2948fa6..4123e0b538 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java @@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException; * Abstract class that adapts a {@link ListenableFuture} parameterized over S into a * {@code ListenableFuture} parameterized over T. All methods are delegated to the * adaptee, where {@link #get()}, {@link #get(long, java.util.concurrent.TimeUnit)}, and - * {@link ListenableFutureCallback#onSuccess(Object)} call {@@link #adapt(Object)} on the + * {@link ListenableFutureCallback#onSuccess(Object)} call {@link #adapt(Object)} on the * adaptee's result. * * @param the type of this {@code Future} diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java index 938999e2ce..ca76f6d72f 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java @@ -23,7 +23,9 @@ import org.springframework.util.Assert; /** * Registry for {@link ListenableFutureCallback} instances. - *

Inspired by {@link com.google.common.util.concurrent.ExecutionList}. + * + *

Inspired by {@code com.google.common.util.concurrent.ExecutionList}. + * * @author Arjen Poutsma * @since 4.0 */ diff --git a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java deleted file mode 100644 index d1bf3f7dbc..0000000000 --- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ - -/** - * - * Support for class instrumentation on Apache Tomcat. - * - */ -package org.springframework.instrument.classloading.tomcat; - diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index 70f60cbf1e..494b8f51d7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -46,8 +46,8 @@ import org.springframework.util.ReflectionUtils; * *

If you want to use dynamic destination creation, you must specify * the type of JMS destination to create, using the "pubSubDomain" property. - * For other operations, this is not necessary, in contrast to when working - * with {@link JmsTemplate102}. Point-to-Point (Queues) is the default domain. + * For other operations, this is not necessary. Point-to-Point (Queues) is the default + * domain. * *

Default settings for JMS Sessions are "not transacted" and "auto-acknowledge". * As defined by the J2EE specification, the transaction and acknowledgement diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java index 277e7ed893..8f0f7c94c2 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java @@ -63,11 +63,10 @@ public abstract class JmsGatewaySupport implements InitializingBean { * Create a JmsTemplate for the given ConnectionFactory. * Only invoked if populating the gateway with a ConnectionFactory reference. *

Can be overridden in subclasses to provide a JmsTemplate instance with - * a different configuration or the JMS 1.0.2 version, JmsTemplate102. + * a different configuration. * @param connectionFactory the JMS ConnectionFactory to create a JmsTemplate for * @return the new JmsTemplate instance * @see #setConnectionFactory - * @see org.springframework.jms.core.JmsTemplate102 */ protected JmsTemplate createJmsTemplate(ConnectionFactory connectionFactory) { return new JmsTemplate(connectionFactory); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java index 57da8dcbc7..52d6ec9493 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java @@ -54,7 +54,7 @@ public abstract class AbstractMessageSendingTemplate implements MessageSendin /** * Set the {@link MessageConverter} that is to be used to convert * between Messages and objects for this template. - *

The default is {@link SimplePayloadMessageConverter}. + *

The default is {@link SimpleMessageConverter}. */ public void setMessageConverter(MessageConverter messageConverter) { Assert.notNull(messageConverter, "'messageConverter' must not be null"); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java index 4f17df9276..a8341ab7e0 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java @@ -19,6 +19,7 @@ package org.springframework.messaging.handler.annotation.support; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.BeanExpressionContext; import org.springframework.beans.factory.config.BeanExpressionResolver; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -37,20 +38,20 @@ import org.springframework.util.ClassUtils; * Abstract base class for resolving method arguments from a named value. Message headers, * and path variables are examples of named values. Each may have a name, a required flag, * and a default value. - *

- * Subclasses define how to do the following: + * + *

Subclasses define how to do the following: *

- *

- * A default value string can contain ${...} placeholders and Spring Expression Language - * #{...} expressions. For this to work a {@link ConfigurableBeanFactory} must be supplied - * to the class constructor. - *

- * A {@link ConversionService} may be used to apply type conversion to the resolved + * + *

A default value string can contain ${...} placeholders and Spring Expression + * Language {@code #{...}} expressions. For this to work a {@link ConfigurableBeanFactory} + * must be supplied to the class constructor. + * + *

A {@link ConversionService} may be used to apply type conversion to the resolved * argument value if it doesn't match the method parameter type. * * @author Rossen Stoyanchev @@ -70,12 +71,11 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle /** * Constructor with a {@link ConversionService} and a {@link BeanFactory}. - * * @param cs conversion service for converting values to match the - * target method parameter type - * @param beanFactory a bean factory to use for resolving ${...} placeholder and - * #{...} SpEL expressions in default values, or {@code null} if default values - * are not expected to contain expressions + * target method parameter type + * @param beanFactory a bean factory to use for resolving {@code ${...}} placeholder + * and {@code #{...}} SpEL expressions in default values, or {@code null} if default + * values are not expected to contain expressions */ protected AbstractNamedValueMethodArgumentResolver(ConversionService cs, ConfigurableBeanFactory beanFactory) { this.conversionService = (cs != null) ? cs : new DefaultConversionService(); @@ -154,7 +154,6 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle * @param parameter the method parameter to resolve to an argument value * @param message the current request * @param name the name of the value being resolved - * * @return the resolved argument. May be {@code null} * @throws Exception in case of errors */ @@ -180,7 +179,6 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle * Invoked when a named value is required, but * {@link #resolveArgumentInternal(MethodParameter, Message, String)} returned {@code null} and * there is no default value. Subclasses typically throw an exception in this case. - * * @param name the name for the value * @param parameter the method parameter * @param message the message being processed @@ -208,7 +206,6 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle /** * Invoked after a value is resolved. - * * @param arg the resolved argument value * @param name the argument name * @param parameter the argument parameter type diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolver.java index a3e55f0a67..3be5bd5f5e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolver.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.Set; /** - * A default implementation of {@link @UserDestinationResolver}. + * A default implementation of {@link UserDestinationResolver}. *

* Resolves messages sent to destination patterns "/user/{user-name}/**" as well as * subscriptions to destinations "/user/queue/**" where the "/user/" prefix used to diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistry.java index e8dc33b8a7..91340da743 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistry.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistry.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; /** - * A default thread-safe implementation of {@link @UserSessionRegistry}. + * A default thread-safe implementation of {@link UserSessionRegistry}. * * @author Rossen Stoyanchev * @since 4.0 diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java index 4f32468ff8..0837695e1c 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java @@ -36,6 +36,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Map; import java.util.UUID; + import javax.activation.DataHandler; import javax.activation.DataSource; import javax.xml.XMLConstants; @@ -63,6 +64,7 @@ import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; @@ -74,7 +76,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; - import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.JdkVersion; diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java index 8e4d74c721..6761ac17f7 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java @@ -182,7 +182,7 @@ public class MockServletContext implements ServletContext { * Create a new MockServletContext using the supplied resource base path and * resource loader. *

Registers a {@link MockRequestDispatcher} for the Servlet named - * {@value #COMMON_DEFAULT_SERVLET_NAME}. + * {@literal 'default'}. * @param resourceBasePath the root directory of the WAR (should not end with a slash) * @param resourceLoader the ResourceLoader to use (or null for the default) * @see #registerNamedDispatcher @@ -383,7 +383,7 @@ public class MockServletContext implements ServletContext { /** * Get the name of the default {@code Servlet}. - *

Defaults to {@value #COMMON_DEFAULT_SERVLET_NAME}. + *

Defaults to {@literal 'default'}. * @see #setDefaultServletName */ public String getDefaultServletName() { diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java index adb9acc305..385a287611 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java @@ -19,6 +19,7 @@ package org.springframework.test.context.junit4.statements; import java.util.ArrayList; import java.util.List; +import org.junit.runners.model.MultipleFailureException; import org.junit.runners.model.Statement; import org.springframework.test.context.TestContextManager; diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java index 05305bd9e1..8d489002f7 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import org.junit.runners.model.MultipleFailureException; import org.junit.runners.model.Statement; import org.springframework.test.context.TestContextManager; diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java index 22b57df589..222b5ae3e5 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java @@ -72,7 +72,7 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi * mode} is set to {@link ClassMode#AFTER_EACH_TEST_METHOD * AFTER_EACH_TEST_METHOD}, the {@linkplain ApplicationContext application * context} of the test context will be - * {@linkplain TestContext#markApplicationContextDirty() marked as dirty} and the + * {@linkplain TestContext#markApplicationContextDirty marked as dirty} and the * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE} * in the test context will be set to {@code true}. */ @@ -107,7 +107,7 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi * If the test class of the supplied {@linkplain TestContext test context} is * annotated with {@link DirtiesContext @DirtiesContext}, the * {@linkplain ApplicationContext application context} of the test context will - * be {@linkplain TestContext#markApplicationContextDirty() marked as dirty}, + * be {@linkplain TestContext#markApplicationContextDirty marked as dirty}, * and the * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context will be set to diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java index 91e29d1113..19cab06cb2 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java @@ -31,7 +31,6 @@ import org.springframework.beans.factory.InitializingBean; * @author Juergen Hoeller * @since 1.2.2 * @see org.springframework.jdbc.core.support.JdbcDaoSupport - * @see org.springframework.orm.jdo.support.JdoDaoSupport */ public abstract class DaoSupport implements InitializingBean { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java index b6a26078da..1afea1cbcc 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java @@ -70,8 +70,7 @@ import org.springframework.transaction.PlatformTransactionManager; *

The "preInterceptors" and "postInterceptors" properties can be set to add * additional interceptors to the mix, like * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor} or - * {@link org.springframework.orm.hibernate3.HibernateInterceptor} / - * {@link org.springframework.orm.jdo.JdoInterceptor}. + * {@link org.springframework.orm.hibernate3.HibernateInterceptor}. * *

HINT: This class is often used with parent / child bean definitions. * Typically, you will define the transaction manager and default transaction diff --git a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java index 8ca6fd9bf4..f5c7a29f3e 100644 --- a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java +++ b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java @@ -29,21 +29,19 @@ public interface StreamingHttpOutputMessage extends HttpOutputMessage { /** * Sets the streaming body for this message. - * * @param body the streaming body */ void setBody(Body body); /** * Defines the contract for bodies that can be written directly to a - * {@link OuputStream}. It is useful with HTTP client libraries that provide indirect + * {@link OutputStream}. It is useful with HTTP client libraries that provide indirect * access to an {@link OutputStream} via a callback mechanism. */ public interface Body { /** - * Writes this body to the given {@link OuputStream}. - * + * Writes this body to the given {@link OutputStream}. * @param outputStream the output stream to write to * @throws IOException in case of errors */ diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java index 92247824d7..a881340cad 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java @@ -63,7 +63,7 @@ import org.springframework.util.StringUtils; * LinkedMultiValueMap<String, Object>(); parts.add("field 1", "value 1"); parts.add("file", new * ClassPathResource("myFile.jpg")); template.postForLocation("http://example.com/myFileUpload", parts); * - *

Some methods in this class were inspired by {@link org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}. + *

Some methods in this class were inspired by {@code org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}. * * @author Arjen Poutsma * @see MultiValueMap diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java index 1d38370f7c..0e8136a562 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java @@ -64,7 +64,7 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke /** * Create a new instance of the HttpComponentsHttpInvokerRequestExecutor with a default - * {@link HttpClient} that uses a default {@link org.apache.http.impl.conn.PoolingClientConnectionManager}. + * {@link HttpClient} that uses a default {@code org.apache.http.impl.conn.PoolingClientConnectionManager}. */ public HttpComponentsHttpInvokerRequestExecutor() { org.apache.http.conn.scheme.SchemeRegistry schemeRegistry = new org.apache.http.conn.scheme.SchemeRegistry(); diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java index 86ab131396..285ec33f72 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java @@ -100,10 +100,10 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor * Set the HttpInvokerRequestExecutor implementation to use for executing * remote invocations. *

Default is {@link SimpleHttpInvokerRequestExecutor}. Alternatively, - * consider using {@link CommonsHttpInvokerRequestExecutor} for more + * consider using {@link HttpComponentsHttpInvokerRequestExecutor} for more * sophisticated needs. * @see SimpleHttpInvokerRequestExecutor - * @see CommonsHttpInvokerRequestExecutor + * @see HttpComponentsHttpInvokerRequestExecutor */ public void setHttpInvokerRequestExecutor(HttpInvokerRequestExecutor httpInvokerRequestExecutor) { this.httpInvokerRequestExecutor = httpInvokerRequestExecutor; diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java index 2b59850fbc..ad651bbe28 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java @@ -31,10 +31,6 @@ import org.springframework.web.util.WebUtils; * which include specifying allowed/required fields, and registering custom * property editors. * - *

Used by Spring Web MVC's BaseCommandController and MultiActionController. - * Note that BaseCommandController and its subclasses allow for easy customization - * of the binder instances that they use through overriding {@code initBinder}. - * *

Can also be used for manual data binding in custom web controllers: * for example, in a plain Controller implementation or in a MultiActionController * handler method. Simply instantiate a ServletRequestDataBinder for each binding @@ -59,7 +55,6 @@ import org.springframework.web.util.WebUtils; * @see #setAllowedFields * @see #setRequiredFields * @see #setFieldMarkerPrefix - * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder */ public class ServletRequestDataBinder extends WebDataBinder { @@ -99,7 +94,6 @@ public class ServletRequestDataBinder extends WebDataBinder { * @param request request with parameters to bind (can be multipart) * @see org.springframework.web.multipart.MultipartHttpServletRequest * @see org.springframework.web.multipart.MultipartFile - * @see #bindMultipartFiles * @see #bind(org.springframework.beans.PropertyValues) */ public void bind(ServletRequest request) { diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java index 9dbff1f5a0..8e810ee2ff 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java @@ -161,7 +161,7 @@ import java.util.concurrent.Callable; * *

The following return types are supported for handler methods: *