diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index 23dcd32a8f..fe6cac14d2 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -433,7 +433,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo return; } if (IN_NATIVE_IMAGE) { - throw new BeanDefinitionStoreException("@Configuration classes need to be marked as proxyBeanMethods=false. Found: " + configBeanDefs.keySet()); + throw new BeanDefinitionStoreException("@Configuration classes need to be marked as " + + "proxyBeanMethods=false. Found: " + configBeanDefs.keySet()); } ConfigurationClassEnhancer enhancer = new ConfigurationClassEnhancer(); diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java index f6177a35b0..668710f02b 100644 --- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java +++ b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java @@ -47,7 +47,7 @@ import org.springframework.util.StringUtils; * @since 3.2 * @see #getSnapshotAsJson() * @see org.springframework.web.context.support.LiveBeansViewServlet - * @deprecated as of 5.3, in favor of using Spring Boot actuators for such need. + * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs */ @Deprecated public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAware { diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java index 9eb2c32209..b8e0ba01bd 100644 --- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java +++ b/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java @@ -21,7 +21,7 @@ package org.springframework.context.support; * * @author Juergen Hoeller * @since 3.2 - * @deprecated as of 5.3, in favor of using Spring Boot actuators for such need. + * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs */ @Deprecated public interface LiveBeansViewMBean { diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverter.java index 96e21d605d..9190f21cd7 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverter.java @@ -39,11 +39,13 @@ import org.springframework.util.ConcurrentReferenceHashMap; import org.springframework.util.StreamUtils; /** - * Implementation of {@link org.springframework.http.converter.HttpMessageConverter} that can read and write JSON using + * Implementation of {@link org.springframework.http.converter.HttpMessageConverter} + * that can read and write JSON using * kotlinx.serialization. * - *

This converter can be used to bind {@code @Serializable} Kotlin classes. It supports {@code application/json} and - * {@code application/*+json} with various character sets, {@code UTF-8} being the default. + *

This converter can be used to bind {@code @Serializable} Kotlin classes. + * It supports {@code application/json} and {@code application/*+json} with + * various character sets, {@code UTF-8} being the default. * * @author Andreas Ahlenstorf * @author Sebastien Deleuze diff --git a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java index 5d3e8bc8f7..39cb3f8991 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java @@ -27,7 +27,8 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** - * Servlet variant of {@link org.springframework.context.support.LiveBeansView}'s MBean exposure. + * Servlet variant of {@link org.springframework.context.support.LiveBeansView}'s + * MBean exposure. * *

Generates a JSON snapshot for current beans and their dependencies in * all ApplicationContexts that live within the current web application. @@ -35,7 +36,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 3.2 * @see org.springframework.context.support.LiveBeansView#getSnapshotAsJson() - * @deprecated as of 5.3, in favor of using Spring Boot actuators for such need. + * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs */ @Deprecated @SuppressWarnings("serial") diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java index d8dc9367b6..cb9e40f58a 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,13 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.Assert; /** - * {@link org.springframework.context.support.LiveBeansView} subclass which looks for all ApplicationContexts - * in the web application, as exposed in ServletContext attributes. + * {@link org.springframework.context.support.LiveBeansView} subclass + * which looks for all ApplicationContexts in the web application, + * as exposed in ServletContext attributes. * * @author Juergen Hoeller * @since 3.2 - * @deprecated as of 5.3, in favor of using Spring Boot actuators for such need. + * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs */ @Deprecated public class ServletContextLiveBeansView extends org.springframework.context.support.LiveBeansView {