diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java index e9797987c4..b70bbc5147 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java @@ -80,8 +80,8 @@ public class DefaultConversionService extends GenericConversionService { /** * Add converters appropriate for most environments. - * @param converterRegistry the registry of converters to add to (must also be castable to ConversionService, - * e.g. being a {@link ConfigurableConversionService}) + * @param converterRegistry the registry of converters to add to + * (must also be castable to ConversionService, e.g. being a {@link ConfigurableConversionService}) * @throws ClassCastException if the given ConverterRegistry could not be cast to a ConversionService */ public static void addDefaultConverters(ConverterRegistry converterRegistry) { @@ -100,9 +100,9 @@ public class DefaultConversionService extends GenericConversionService { } /** - * Add collection converters. - * @param converterRegistry the registry of converters to add to (must also be castable to ConversionService, - * e.g. being a {@link ConfigurableConversionService}) + * Add common collection converters. + * @param converterRegistry the registry of converters to add to + * (must also be castable to ConversionService, e.g. being a {@link ConfigurableConversionService}) * @throws ClassCastException if the given ConverterRegistry could not be cast to a ConversionService * @since 4.2.3 */ @@ -148,7 +148,7 @@ public class DefaultConversionService extends GenericConversionService { converterRegistry.addConverterFactory(new StringToEnumConverterFactory()); converterRegistry.addConverter(new EnumToStringConverter((ConversionService) converterRegistry)); - + converterRegistry.addConverterFactory(new IntegerToEnumConverterFactory()); converterRegistry.addConverter(new EnumToIntegerConverter((ConversionService) converterRegistry)); diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java index 93fd3c61b3..904ed9f7c2 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java @@ -27,8 +27,8 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; */ public class OxmNamespaceHandler extends NamespaceHandlerSupport { - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public void init() { registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser()); registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser()); diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java index 200819ee78..3c22c99490 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java @@ -187,11 +187,9 @@ public class FormHttpMessageConverter implements HttpMessageConverterAs of 5.0 by default part headers, including Content-Disposition (and * its filename parameter) will be encoded based on the setting of * {@link #setCharset(Charset)} or {@code UTF-8} by default. - * * @since 4.1.1 * @see Encoded-Word */ diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 4acd8ae02e..35b7372e92 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -125,29 +125,38 @@ import org.springframework.web.util.UriTemplateHandler; public class RestTemplate extends InterceptingHttpAccessor implements RestOperations { private static boolean romePresent = - ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", + RestTemplate.class.getClassLoader()); private static final boolean jaxb2Present = - ClassUtils.isPresent("javax.xml.bind.Binder", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("javax.xml.bind.Binder", + RestTemplate.class.getClassLoader()); private static final boolean jackson2Present = - ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", RestTemplate.class.getClassLoader()) && - ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", + RestTemplate.class.getClassLoader()) && + ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", + RestTemplate.class.getClassLoader()); private static final boolean jackson2XmlPresent = - ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", + RestTemplate.class.getClassLoader()); private static final boolean jackson2SmilePresent = - ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", + RestTemplate.class.getClassLoader()); private static final boolean jackson2CborPresent = - ClassUtils.isPresent("com.fasterxml.jackson.dataformat.cbor.CBORFactory", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.fasterxml.jackson.dataformat.cbor.CBORFactory", + RestTemplate.class.getClassLoader()); private static final boolean gsonPresent = - ClassUtils.isPresent("com.google.gson.Gson", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("com.google.gson.Gson", + RestTemplate.class.getClassLoader()); private static final boolean jsonbPresent = - ClassUtils.isPresent("javax.json.bind.Jsonb", RestTemplate.class.getClassLoader()); + ClassUtils.isPresent("javax.json.bind.Jsonb", + RestTemplate.class.getClassLoader()); private final List> messageConverters = new ArrayList<>(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index 1cba95bde1..760b30a3d3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -105,9 +105,9 @@ import org.springframework.web.util.UrlPathHelper; * It is typically imported by adding {@link EnableWebMvc @EnableWebMvc} to an * application {@link Configuration @Configuration} class. An alternative more * advanced option is to extend directly from this class and override methods as - * necessary remembering to add {@link Configuration @Configuration} to the + * necessary, remembering to add {@link Configuration @Configuration} to the * subclass and {@link Bean @Bean} to overridden {@link Bean @Bean} methods. - * For more details see the Javadoc of {@link EnableWebMvc @EnableWebMvc}. + * For more details see the javadoc of {@link EnableWebMvc @EnableWebMvc}. * *

This class registers the following {@link HandlerMapping}s:

*