Skip to content

Commit c622f4c

Browse files
committed
Polishing
1 parent 62d1b4b commit c622f4c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,6 +37,9 @@
3737
* as {@code DefaultConversionService} exposes its own
3838
* {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method.
3939
*
40+
* <p>Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time
41+
* and/or Joda-Time, depending on the presence of the corresponding API on the classpath.
42+
*
4043
* @author Chris Beams
4144
* @author Juergen Hoeller
4245
* @since 3.1
@@ -92,9 +95,10 @@ public DefaultFormattingConversionService(StringValueResolver embeddedValueResol
9295

9396

9497
/**
95-
* Add formatters appropriate for most environments, including number formatters and a Joda-Time
96-
* date formatter if Joda-Time is present on the classpath.
97-
* @param formatterRegistry the service to register default formatters against
98+
* Add formatters appropriate for most environments: including number formatters,
99+
* JSR-354 Money & Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters,
100+
* depending on the presence of the corresponding API on the classpath.
101+
* @param formatterRegistry the service to register default formatters with
98102
*/
99103
public static void addDefaultFormatters(FormatterRegistry formatterRegistry) {
100104
// Default handling of number values

spring-web/src/main/java/org/springframework/web/util/WebUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Map;
2424
import java.util.StringTokenizer;
2525
import java.util.TreeMap;
26-
2726
import javax.servlet.ServletContext;
2827
import javax.servlet.ServletRequest;
2928
import javax.servlet.ServletRequestWrapper;
@@ -752,7 +751,7 @@ public static String extractFullFilenameFromUrlPath(String urlPath) {
752751
* keys {@code "q1"} and {@code "q2"} with values {@code ["a","b"]} and
753752
* {@code ["a","b","c"]} respectively.
754753
* @param matrixVariables the unparsed matrix variables string
755-
* @return a map with matrix variable names and values, never {@code null}
754+
* @return a map with matrix variable names and values (never {@code null})
756755
* @since 3.2
757756
*/
758757
public static MultiValueMap<String, String> parseMatrixVariables(String matrixVariables) {
@@ -782,7 +781,7 @@ public static MultiValueMap<String, String> parseMatrixVariables(String matrixVa
782781
* Check the given request origin against a list of allowed origins.
783782
* A list containing "*" means that all origins are allowed.
784783
* An empty list means only same origin is allowed.
785-
* @return true if the request origin is valid, false otherwise
784+
* @return {@code true} if the request origin is valid, {@code false} otherwise
786785
* @since 4.1.5
787786
* @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
788787
*/

0 commit comments

Comments
 (0)