From 2c8d1b7bff4731cb499b73c0971f51a1e9831963 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 7 Jun 2023 17:21:59 +0200 Subject: [PATCH] Polishing --- .../concurrent/ExecutorConfigurationSupport.java | 8 +++++--- .../context/support/GenericApplicationContextTests.java | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java index 17e76d0190..55ca08ed9b 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java @@ -36,7 +36,10 @@ import org.springframework.lang.Nullable; * Base class for setting up a {@link java.util.concurrent.ExecutorService} * (typically a {@link java.util.concurrent.ThreadPoolExecutor} or * {@link java.util.concurrent.ScheduledThreadPoolExecutor}). - * Defines common configuration settings and common lifecycle handling. + * + *

Defines common configuration settings and common lifecycle handling, + * inheriting thread customization options (name, priority, etc) from + * {@link org.springframework.util.CustomizableThreadCreator}. * * @author Juergen Hoeller * @since 3.0 @@ -199,8 +202,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac /** - * Calls {@code shutdown} when the BeanFactory destroys - * the task executor instance. + * Calls {@code shutdown} when the BeanFactory destroys the executor instance. * @see #shutdown() */ @Override diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java index f90a428128..dbcbb90cff 100644 --- a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java @@ -76,11 +76,13 @@ class GenericApplicationContextTests { private final GenericApplicationContext context = new GenericApplicationContext(); + @AfterEach void closeContext() { context.close(); } + @Test void getBeanForClass() { context.registerBeanDefinition("testBean", new RootBeanDefinition(String.class)); @@ -91,7 +93,7 @@ class GenericApplicationContextTests { assertThat(context.getBean(CharSequence.class)).isSameAs(context.getBean("testBean")); assertThatExceptionOfType(NoUniqueBeanDefinitionException.class) - .isThrownBy(() -> context.getBean(Object.class)); + .isThrownBy(() -> context.getBean(Object.class)); } @Test @@ -509,6 +511,7 @@ class GenericApplicationContextTests { context.close(); } + private MergedBeanDefinitionPostProcessor registerMockMergedBeanDefinitionPostProcessor(GenericApplicationContext context) { MergedBeanDefinitionPostProcessor bpp = mock(); context.registerBeanDefinition("bpp", BeanDefinitionBuilder.rootBeanDefinition( @@ -563,9 +566,9 @@ class GenericApplicationContextTests { public void setCounter(Integer counter) { this.counter = counter; } - } + static class TestAotFactoryBean extends AbstractFactoryBean { TestAotFactoryBean() { @@ -584,6 +587,7 @@ class GenericApplicationContextTests { } } + static class PingPongProtocolResolver implements ProtocolResolver { @Override