From f70739430bd754fe8d068e76d415b2f035209345 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 8 Dec 2013 23:27:31 +0100 Subject: [PATCH] Polishing --- .../org/springframework/http/MediaType.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java index 0da1b9520f..2aa8a6d01f 100644 --- a/spring-web/src/main/java/org/springframework/http/MediaType.java +++ b/spring-web/src/main/java/org/springframework/http/MediaType.java @@ -234,16 +234,15 @@ public class MediaType extends MimeType implements Serializable { * Create a new {@code MediaType} for the given type, subtype, and character set. * @param type the primary type * @param subtype the subtype - * @param charSet the character set + * @param charset the character set * @throws IllegalArgumentException if any of the parameters contain illegal characters */ - public MediaType(String type, String subtype, Charset charSet) { - super(type, subtype, charSet); + public MediaType(String type, String subtype, Charset charset) { + super(type, subtype, charset); } /** * Create a new {@code MediaType} for the given type, subtype, and quality value. - * * @param type the primary type * @param subtype the subtype * @param qualityValue the quality value @@ -275,6 +274,7 @@ public class MediaType extends MimeType implements Serializable { super(type, subtype, parameters); } + protected void checkParameters(String attribute, String value) { super.checkParameters(attribute, value); if (PARAM_QUALITY_FACTOR.equals(attribute)) { @@ -343,6 +343,7 @@ public class MediaType extends MimeType implements Serializable { return new MediaType(this, params); } + /** * Parse the given String value into a {@code MediaType} object, * with this method name following the 'valueOf' naming convention @@ -360,7 +361,6 @@ public class MediaType extends MimeType implements Serializable { * @throws InvalidMediaTypeException if the string cannot be parsed */ public static MediaType parseMediaType(String mediaType) { - MimeType type; try { type = MimeTypeUtils.parseMimeType(mediaType); @@ -368,7 +368,6 @@ public class MediaType extends MimeType implements Serializable { catch (InvalidMimeTypeException ex) { throw new InvalidMediaTypeException(ex); } - try { return new MediaType(type.getType(), type.getSubtype(), type.getParameters()); } @@ -412,18 +411,18 @@ public class MediaType extends MimeType implements Serializable { * Sorts the given list of {@code MediaType} objects by specificity. *

Given two media types: *

    - *
  1. if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the - * wildcard is ordered before the other.
    2. - *
  2. if the two media types have different {@linkplain #getType() types}, then they are considered equal and - * remain their current order.
    3. - *
  3. if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without - * the wildcard is sorted before the other.
    4. - *
  4. if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal - * and remain their current order.
    5. - *
  5. 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.
    6. - *
  6. 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.
    7. + *
  7. if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the + * wildcard is ordered before the other.
    8. + *
  8. if the two media types have different {@linkplain #getType() types}, then they are considered equal and + * remain their current order.
    9. + *
  9. if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without + * the wildcard is sorted before the other.
    10. + *
  10. if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal + * and remain their current order.
    11. + *
  11. 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.
    12. + *
  12. 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.
    13. *
*

For example: *

audio/basic < audio/* < */*
@@ -445,18 +444,18 @@ public class MediaType extends MimeType implements Serializable { * Sorts the given list of {@code MediaType} objects by quality value. *

Given two media types: *

    - *
  1. 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.
    2. - *
  2. if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the - * wildcard is ordered before the other.
    3. - *
  3. if the two media types have different {@linkplain #getType() types}, then they are considered equal and - * remain their current order.
    4. - *
  4. if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without - * the wildcard is sorted before the other.
    5. - *
  5. if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal - * and remain their current order.
    6. - *
  6. 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.
    7. + *
  7. 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.
    8. + *
  8. if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the + * wildcard is ordered before the other.
    9. + *
  9. if the two media types have different {@linkplain #getType() types}, then they are considered equal and + * remain their current order.
    10. + *
  10. if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without + * the wildcard is sorted before the other.
    11. + *
  11. if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal + * and remain their current order.
    12. + *
  12. 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.
    13. *
* @param mediaTypes the list of media types to be sorted * @see #getQualityValue() @@ -524,6 +523,7 @@ public class MediaType extends MimeType implements Serializable { } }; + /** * Comparator used by {@link #sortBySpecificity(List)}. */