GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing

pull/439/head
Juergen Hoeller 12 years ago
parent
6bed18004e
commit
d4b0751626
3 changed files with 33 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      spring-web/src/main/java/org/springframework/http/MediaType.java
  2. 10
      spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
  3. 10
      spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java

55
spring-web/src/main/java/org/springframework/http/MediaType.java
Unescape View File

@ -284,16 +284,15 @@ public class MediaType implements Comparable<MediaType> {
* Create a new {@code MediaType} for the given type, subtype, and character set. * Create a new {@code MediaType} for the given type, subtype, and character set.
* @param type the primary type * @param type the primary type
* @param subtype the subtype * @param subtype the subtype
* @param charSet the character set * @param charset the character set
* @throws IllegalArgumentException if any of the parameters contain illegal characters * @throws IllegalArgumentException if any of the parameters contain illegal characters
*/ */
public MediaType(String type, String subtype, Charset charSet) { public MediaType(String type, String subtype, Charset charset) {
this(type, subtype, Collections.singletonMap(PARAM_CHARSET, charSet.name())); this(type, subtype, Collections.singletonMap(PARAM_CHARSET, charset.name()));
} }
/** /**
* Create a new {@code MediaType} for the given type, subtype, and quality value. * Create a new {@code MediaType} for the given type, subtype, and quality value.
*
* @param type the primary type * @param type the primary type
* @param subtype the subtype * @param subtype the subtype
* @param qualityValue the quality value * @param qualityValue the quality value
@ -774,18 +773,18 @@ public class MediaType implements Comparable<MediaType> {
* Sorts the given list of {@code MediaType} objects by specificity. * Sorts the given list of {@code MediaType} objects by specificity.
* <p>Given two media types: * <p>Given two media types:
* <ol> * <ol>
* <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the * <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
* wildcard is ordered before the other.</li> * wildcard is ordered before the other.</li>
* <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and * <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
* remain their current order.</li> * remain their current order.</li>
* <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without * <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
* the wildcard is sorted before the other.</li> * the wildcard is sorted before the other.</li>
* <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal * <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
* and remain their current order.</li> * and remain their current order.</li>
* <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type * <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
* with the highest quality value is ordered before the other.</li> * with the highest quality value is ordered before the other.</li>
* <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the * <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
* media type with the most parameters is ordered before the other.</li> * media type with the most parameters is ordered before the other.</li>
* </ol> * </ol>
* <p>For example: * <p>For example:
* <blockquote>audio/basic &lt; audio/* &lt; *&#047;*</blockquote> * <blockquote>audio/basic &lt; audio/* &lt; *&#047;*</blockquote>
@ -807,18 +806,18 @@ public class MediaType implements Comparable<MediaType> {
* Sorts the given list of {@code MediaType} objects by quality value. * Sorts the given list of {@code MediaType} objects by quality value.
* <p>Given two media types: * <p>Given two media types:
* <ol> * <ol>
* <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type * <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
* with the highest quality value is ordered before the other.</li> * with the highest quality value is ordered before the other.</li>
* <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the * <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
* wildcard is ordered before the other.</li> * wildcard is ordered before the other.</li>
* <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and * <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
* remain their current order.</li> * remain their current order.</li>
* <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without * <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
* the wildcard is sorted before the other.</li> * the wildcard is sorted before the other.</li>
* <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal * <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
* and remain their current order.</li> * and remain their current order.</li>
* <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the * <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
* media type with the most parameters is ordered before the other.</li> * media type with the most parameters is ordered before the other.</li>
* </ol> * </ol>
* @param mediaTypes the list of media types to be sorted * @param mediaTypes the list of media types to be sorted
* @see #getQualityValue() * @see #getQualityValue()

10
spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
Unescape 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.
@ -33,7 +33,6 @@ public interface HandlerMethodArgumentResolver {
/** /**
* Whether the given {@linkplain MethodParameter method parameter} is * Whether the given {@linkplain MethodParameter method parameter} is
* supported by this resolver. * supported by this resolver.
*
* @param parameter the method parameter to check * @param parameter the method parameter to check
* @return {@code true} if this resolver supports the supplied parameter; * @return {@code true} if this resolver supports the supplied parameter;
* {@code false} otherwise * {@code false} otherwise
@ -46,7 +45,6 @@ public interface HandlerMethodArgumentResolver {
* request. A {@link WebDataBinderFactory} provides a way to create * request. A {@link WebDataBinderFactory} provides a way to create
* a {@link WebDataBinder} instance when needed for data binding and * a {@link WebDataBinder} instance when needed for data binding and
* type conversion purposes. * type conversion purposes.
*
* @param parameter the method parameter to resolve. This parameter must * @param parameter the method parameter to resolve. This parameter must
* have previously been passed to * have previously been passed to
* {@link #supportsParameter(org.springframework.core.MethodParameter)} * {@link #supportsParameter(org.springframework.core.MethodParameter)}
@ -57,9 +55,7 @@ public interface HandlerMethodArgumentResolver {
* @return the resolved argument value, or {@code null}. * @return the resolved argument value, or {@code null}.
* @throws Exception in case of errors with the preparation of argument values * @throws Exception in case of errors with the preparation of argument values
*/ */
Object resolveArgument(MethodParameter parameter, Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception;
NativeWebRequest webRequest,
WebDataBinderFactory binderFactory) throws Exception;
} }

10
spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
Unescape 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.
@ -31,7 +31,6 @@ public interface HandlerMethodReturnValueHandler {
/** /**
* Whether the given {@linkplain MethodParameter method return type} is * Whether the given {@linkplain MethodParameter method return type} is
* supported by this handler. * supported by this handler.
*
* @param returnType the method return type to check * @param returnType the method return type to check
* @return {@code true} if this handler supports the supplied return type; * @return {@code true} if this handler supports the supplied return type;
* {@code false} otherwise * {@code false} otherwise
@ -43,7 +42,6 @@ public interface HandlerMethodReturnValueHandler {
* setting a view or setting the * setting a view or setting the
* {@link ModelAndViewContainer#setRequestHandled} flag to {@code true} * {@link ModelAndViewContainer#setRequestHandled} flag to {@code true}
* to indicate the response has been handled directly. * to indicate the response has been handled directly.
*
* @param returnValue the value returned from the handler method * @param returnValue the value returned from the handler method
* @param returnType the type of the return value. This type must have * @param returnType the type of the return value. This type must have
* previously been passed to * previously been passed to
@ -53,9 +51,7 @@ public interface HandlerMethodReturnValueHandler {
* @param webRequest the current request * @param webRequest the current request
* @throws Exception if the return value handling results in an error * @throws Exception if the return value handling results in an error
*/ */
void handleReturnValue(Object returnValue, void handleReturnValue(Object returnValue, MethodParameter returnType,
MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception;
ModelAndViewContainer mavContainer,
NativeWebRequest webRequest) throws Exception;
} }

Write Preview
Loading…
Cancel
Save