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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rossen Stoyanchev 2013-07-11 09:18:45 -04:00
parent 2a559028ad a5c3c12627
commit 6407caac8f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -20,24 +20,24 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* MVC framework SPI interface, allowing parameterization of core MVC workflow. * MVC framework SPI, allowing parameterization of the core MVC workflow.
* *
* <p>Interface that must be implemented for each handler type to handle a request. * <p>Interface that must be implemented for each handler type to handle a request.
* This interface is used to allow the {@link DispatcherServlet} to be indefinitely * This interface is used to allow the {@link DispatcherServlet} to be indefinitely
* extensible. The DispatcherServlet accesses all installed handlers through this * extensible. The {@code DispatcherServlet} accesses all installed handlers through
* interface, meaning that it does not contain code specific to any handler type. * this interface, meaning that it does not contain code specific to any handler type.
* *
* <p>Note that a handler can be of type {@code Object}. This is to enable * <p>Note that a handler can be of type {@code Object}. This is to enable
* handlers from other frameworks to be integrated with this framework without * handlers from other frameworks to be integrated with this framework without
* custom coding, as well as to allow for annotation handler objects that do * custom coding, as well as to allow for annotation-driven handler objects that
* not obey any specific Java interface. * do not obey any specific Java interface.
* *
* <p>This interface is not intended for application developers. It is available * <p>This interface is not intended for application developers. It is available
* to handlers who want to develop their own web workflow. * to handlers who want to develop their own web workflow.
* *
* <p>Note: HandlerAdaptger implementators may implement the * <p>Note: {@code HandlerAdapter} implementors may implement the {@link
* {@link org.springframework.core.Ordered} interface to be able to specify a * org.springframework.core.Ordered} interface to be able to specify a sorting
* sorting order (and thus a priority) for getting applied by DispatcherServlet. * order (and thus a priority) for getting applied by the {@code DispatcherServlet}.
* Non-Ordered instances get treated as lowest priority. * Non-Ordered instances get treated as lowest priority.
* *
* @author Rod Johnson * @author Rod Johnson
@ -48,8 +48,8 @@ import javax.servlet.http.HttpServletResponse;
public interface HandlerAdapter { public interface HandlerAdapter {
/** /**
* Given a handler instance, return whether or not this HandlerAdapter can * Given a handler instance, return whether or not this {@code HandlerAdapter}
* support it. Typical HandlerAdapters will base the decision on the handler * can support it. Typical HandlerAdapters will base the decision on the handler
* type. HandlerAdapters will usually only support one handler type each. * type. HandlerAdapters will usually only support one handler type each.
* <p>A typical implementation: * <p>A typical implementation:
* <p>{@code * <p>{@code

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -30,7 +30,7 @@ import org.springframework.web.servlet.View;
* *
* <p>If the return value is {@code null}, the * <p>If the return value is {@code null}, the
* {@link ModelAndViewContainer#setRequestHandled(boolean)} flag is set to * {@link ModelAndViewContainer#setRequestHandled(boolean)} flag is set to
* {@code false} to indicate the request was handled directly. * {@code true} to indicate the request was handled directly.
* *
* <p>A {@link ModelAndView} return type has a set purpose. Therefore this * <p>A {@link ModelAndView} return type has a set purpose. Therefore this
* handler should be configured ahead of handlers that support any return * handler should be configured ahead of handlers that support any return