2
2
3
3
import java .util .Optional ;
4
4
5
- import org .springframework .boot .autoconfigure .web .format .DateTimeFormatters ;
6
5
import org .springframework .boot .autoconfigure .web .format .WebConversionService ;
7
- import org .springframework .boot .autoconfigure .web .reactive .WebFluxProperties .Format ;
8
6
import org .springframework .core .convert .TypeDescriptor ;
7
+ import org .springframework .format .support .DefaultFormattingConversionService ;
8
+ import org .springframework .format .support .FormattingConversionService ;
9
9
import org .springframework .lang .Nullable ;
10
10
11
11
/**
15
15
public class WebConversionServiceProvider {
16
16
17
17
/**
18
- * The Web conversion service.
18
+ * The Formatting conversion service.
19
19
*/
20
- private final WebConversionService webConversionService ;
20
+ private final FormattingConversionService formattingConversionService ;
21
21
22
22
/**
23
23
* Instantiates a new Web conversion service provider.
@@ -26,12 +26,9 @@ public class WebConversionServiceProvider {
26
26
*/
27
27
public WebConversionServiceProvider (Optional <WebConversionService > webConversionServiceOptional ) {
28
28
if (webConversionServiceOptional .isPresent ())
29
- this .webConversionService = webConversionServiceOptional .get ();
30
- else {
31
- final Format format = new Format ();
32
- this .webConversionService = new WebConversionService (new DateTimeFormatters ()
33
- .dateFormat (format .getDate ()).timeFormat (format .getTime ()).dateTimeFormat (format .getDateTime ()));
34
- }
29
+ this .formattingConversionService = webConversionServiceOptional .get ();
30
+ else
31
+ formattingConversionService = new DefaultFormattingConversionService ();
35
32
}
36
33
37
34
/**
@@ -43,6 +40,6 @@ public WebConversionServiceProvider(Optional<WebConversionService> webConversion
43
40
*/
44
41
@ Nullable
45
42
public Object convert (@ Nullable Object source , TypeDescriptor targetTypeDescriptor ) {
46
- return webConversionService .convert (source , targetTypeDescriptor );
43
+ return formattingConversionService .convert (source , targetTypeDescriptor );
47
44
}
48
45
}
0 commit comments