Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce instance supplier use to appease AOT

Browse Source 
* Remove the use of instance suppliers on bean definitions
that are processed during the AOT phase.

* The remaining areas that use instance suppliers do so
at runtime and do not use reflection, but instead
are passed the configured bean to register.

See https://github.com/spring-cloud/spring-cloud-stream/issues/2655

**Cherry-pick to `6.0.x`**
This commit is contained in:
Chris Bono
2023-03-02 18:00:25 -06:00
committed by abilan
parent d9f3821b9b
commit 5c96c0ded0
17 changed files with 82 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2021 the original author or authors.
* Copyright 2014-2023 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.
@@ -42,6 +42,7 @@ import org.springframework.web.util.pattern.PathPatternParser;
*
* @author Artem Bilan
* @author Gary Russell
* @author Chris Bono
*
* @since 4.1
*/
@@ -85,8 +86,7 @@ public class WebSocketIntegrationConfigurationInitializer implements Integration
if (!registry.containsBeanDefinition("defaultSockJsTaskScheduler")) {
BeanDefinitionBuilder beanDefinitionBuilder =
BeanDefinitionBuilder.genericBeanDefinition(ThreadPoolTaskScheduler.class,
ThreadPoolTaskScheduler::new)
BeanDefinitionBuilder.genericBeanDefinition(ThreadPoolTaskScheduler.class)
.addPropertyValue("threadNamePrefix", "SockJS-")
.addPropertyValue("poolSize", Runtime.getRuntime().availableProcessors())
.addPropertyValue("removeOnCancelPolicy", true);
@@ -97,19 +97,16 @@ public class WebSocketIntegrationConfigurationInitializer implements Integration
!registry.containsBeanDefinition(WEB_SOCKET_HANDLER_MAPPING_BEAN_NAME)) {
registry.registerBeanDefinition("integrationServletWebSocketHandlerRegistry",
new RootBeanDefinition(IntegrationServletWebSocketHandlerRegistry.class,
IntegrationServletWebSocketHandlerRegistry::new));
new RootBeanDefinition(IntegrationServletWebSocketHandlerRegistry.class));
BeanDefinitionBuilder beanDefinitionBuilder =
BeanDefinitionBuilder.genericBeanDefinition(IntegrationDynamicWebSocketHandlerMapping.class,
IntegrationDynamicWebSocketHandlerMapping::new)
BeanDefinitionBuilder.genericBeanDefinition(IntegrationDynamicWebSocketHandlerMapping.class)
.addPropertyValue("patternParser", new PathPatternParser())
.addPropertyValue("order", 0);
BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinitionBuilder.getBeanDefinition(), registry);
BeanDefinitionBuilder enableWebSocketBuilder =
BeanDefinitionBuilder.genericBeanDefinition(WebSocketHandlerMappingFactoryBean.class,
WebSocketHandlerMappingFactoryBean::new)
BeanDefinitionBuilder.genericBeanDefinition(WebSocketHandlerMappingFactoryBean.class)
.addPropertyReference("registry", "integrationServletWebSocketHandlerRegistry")
.addPropertyReference("sockJsTaskScheduler", "defaultSockJsTaskScheduler")
.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);