From d0ceefedc6588fd57c0df1f2729e7fbffac8a3c1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 18 Feb 2025 13:13:34 +0100 Subject: [PATCH] Mark XML-configured executor/scheduler as infrastructure bean Closes gh-34015 --- .../scheduling/config/ExecutorBeanDefinitionParser.java | 4 +++- .../scheduling/config/SchedulerBeanDefinitionParser.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java index 5bd91dd481e..3516eff33b4 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -18,6 +18,7 @@ package org.springframework.scheduling.config; import org.w3c.dom.Element; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; @@ -53,6 +54,7 @@ public class ExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionPa if (StringUtils.hasText(poolSize)) { builder.addPropertyValue("poolSize", poolSize); } + builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); } private void configureRejectionPolicy(Element element, BeanDefinitionBuilder builder) { diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java index a9429e4901a..4eb9e1c1431 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2025 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. @@ -18,6 +18,7 @@ package org.springframework.scheduling.config; import org.w3c.dom.Element; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.util.StringUtils; @@ -41,6 +42,7 @@ public class SchedulerBeanDefinitionParser extends AbstractSingleBeanDefinitionP if (StringUtils.hasText(poolSize)) { builder.addPropertyValue("poolSize", poolSize); } + builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); } }