diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java index abd651d10c0..91f0f569c3c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-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. @@ -577,7 +577,7 @@ protected AbstractEndpoint createEndpoint(MessageHandler handler, @SuppressWarni catch (DestinationResolutionException e) { if (e.getCause() instanceof NoSuchBeanDefinitionException) { this.definitionRegistry.registerBeanDefinition(inputChannelName, - new RootBeanDefinition(DirectChannel.class, DirectChannel::new)); + new RootBeanDefinition(DirectChannel.class)); inputChannel = this.beanFactory.getBean(inputChannelName, MessageChannel.class); } else { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java index 5178becb790..dce6701d928 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-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. @@ -70,6 +70,7 @@ * @author Gary Russell * @author Michael Wiles * @author Pierre Lakreb + * @author Chris Bono * * @see IntegrationContextUtils */ @@ -153,14 +154,14 @@ public void afterSingletonsInstantiated() { private void registerBeanFactoryChannelResolver() { if (!this.beanFactory.containsBeanDefinition(ChannelResolverUtils.CHANNEL_RESOLVER_BEAN_NAME)) { this.registry.registerBeanDefinition(ChannelResolverUtils.CHANNEL_RESOLVER_BEAN_NAME, - new RootBeanDefinition(BeanFactoryChannelResolver.class, BeanFactoryChannelResolver::new)); + new RootBeanDefinition(BeanFactoryChannelResolver.class)); } } private void registerMessagePublishingErrorHandler() { if (!this.beanFactory.containsBeanDefinition(ChannelUtils.MESSAGE_PUBLISHING_ERROR_HANDLER_BEAN_NAME)) { this.registry.registerBeanDefinition(ChannelUtils.MESSAGE_PUBLISHING_ERROR_HANDLER_BEAN_NAME, - new RootBeanDefinition(MessagePublishingErrorHandler.class, MessagePublishingErrorHandler::new)); + new RootBeanDefinition(MessagePublishingErrorHandler.class)); } } @@ -173,8 +174,7 @@ private void registerNullChannel() { BeanDefinition nullChannelDefinition = null; BeanFactory beanFactoryToUse = this.beanFactory; do { - if (beanFactoryToUse instanceof ConfigurableListableBeanFactory) { - ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) beanFactoryToUse; + if (beanFactoryToUse instanceof ConfigurableListableBeanFactory listable) { if (listable.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) { nullChannelDefinition = listable.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME); @@ -193,7 +193,7 @@ private void registerNullChannel() { } else { this.registry.registerBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME, - new RootBeanDefinition(NullChannel.class, NullChannel::new)); + new RootBeanDefinition(NullChannel.class)); } } @@ -208,9 +208,8 @@ private void registerErrorChannel() { LOGGER.info(() -> "No bean named '" + IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME + "' has been explicitly defined. " + "Therefore, a default PublishSubscribeChannel will be created."); - this.registry.registerBeanDefinition(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME, - BeanDefinitionBuilder.rootBeanDefinition(PublishSubscribeChannel.class, this::createErrorChannel) + BeanDefinitionBuilder.rootBeanDefinition(PublishSubscribeChannel.class) .addConstructorArgValue(IntegrationProperties.getExpressionFor( IntegrationProperties.ERROR_CHANNEL_REQUIRE_SUBSCRIBERS)) .addPropertyValue("ignoreFailures", IntegrationProperties.getExpressionFor( @@ -220,15 +219,13 @@ private void registerErrorChannel() { String errorLoggerBeanName = IntegrationContextUtils.ERROR_LOGGER_BEAN_NAME + IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX; this.registry.registerBeanDefinition(errorLoggerBeanName, - BeanDefinitionBuilder.genericBeanDefinition(LoggingHandler.class, - () -> new LoggingHandler(LoggingHandler.Level.ERROR)) + BeanDefinitionBuilder.genericBeanDefinition(LoggingHandler.class) .addConstructorArgValue(LoggingHandler.Level.ERROR) .addPropertyValue(IntegrationNamespaceUtils.ORDER, Ordered.LOWEST_PRECEDENCE - 100) .getBeanDefinition()); BeanDefinitionBuilder loggingEndpointBuilder = - BeanDefinitionBuilder.genericBeanDefinition(ConsumerEndpointFactoryBean.class, - ConsumerEndpointFactoryBean::new) + BeanDefinitionBuilder.genericBeanDefinition(ConsumerEndpointFactoryBean.class) .addPropertyValue("inputChannelName", IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME) .addPropertyReference("handler", errorLoggerBeanName); @@ -239,11 +236,6 @@ private void registerErrorChannel() { } } - private PublishSubscribeChannel createErrorChannel() { - IntegrationProperties integrationProperties = IntegrationContextUtils.getIntegrationProperties(this.beanFactory); - return new PublishSubscribeChannel(integrationProperties.isErrorChannelRequireSubscribers()); - } - /** * Register {@link IntegrationEvaluationContextFactoryBean} * and {@link IntegrationSimpleEvaluationContextFactoryBean} beans, if necessary. @@ -251,8 +243,7 @@ private PublishSubscribeChannel createErrorChannel() { private void registerIntegrationEvaluationContext() { if (!this.registry.containsBeanDefinition(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME)) { BeanDefinitionBuilder integrationEvaluationContextBuilder = - BeanDefinitionBuilder.genericBeanDefinition(IntegrationEvaluationContextFactoryBean.class, - IntegrationEvaluationContextFactoryBean::new) + BeanDefinitionBuilder.genericBeanDefinition(IntegrationEvaluationContextFactoryBean.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); this.registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, @@ -263,8 +254,7 @@ private void registerIntegrationEvaluationContext() { IntegrationContextUtils.INTEGRATION_SIMPLE_EVALUATION_CONTEXT_BEAN_NAME)) { BeanDefinitionBuilder integrationEvaluationContextBuilder = - BeanDefinitionBuilder.genericBeanDefinition(IntegrationSimpleEvaluationContextFactoryBean.class, - IntegrationSimpleEvaluationContextFactoryBean::new) + BeanDefinitionBuilder.genericBeanDefinition(IntegrationSimpleEvaluationContextFactoryBean.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); this.registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_SIMPLE_EVALUATION_CONTEXT_BEAN_NAME, @@ -286,7 +276,7 @@ private void registerIdGeneratorConfigurer() { return; } } - RootBeanDefinition beanDefinition = new RootBeanDefinition(clazz, IdGeneratorConfigurer::new); + RootBeanDefinition beanDefinition = new RootBeanDefinition(clazz); beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, this.registry); } @@ -300,8 +290,7 @@ private void registerTaskScheduler() { "' has been explicitly defined. " + "Therefore, a default ThreadPoolTaskScheduler will be created."); BeanDefinition scheduler = - BeanDefinitionBuilder.genericBeanDefinition(ThreadPoolTaskScheduler.class, - ThreadPoolTaskScheduler::new) + BeanDefinitionBuilder.genericBeanDefinition(ThreadPoolTaskScheduler.class) .addPropertyValue("poolSize", IntegrationProperties.getExpressionFor( IntegrationProperties.TASK_SCHEDULER_POOL_SIZE)) .addPropertyValue("threadNamePrefix", "task-scheduler-") @@ -319,7 +308,7 @@ private void registerTaskScheduler() { private void registerIntegrationProperties() { if (!this.beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_GLOBAL_PROPERTIES_BEAN_NAME)) { BeanDefinition userProperties = - BeanDefinitionBuilder.genericBeanDefinition(PropertiesFactoryBean.class, PropertiesFactoryBean::new) + BeanDefinitionBuilder.genericBeanDefinition(PropertiesFactoryBean.class) .addPropertyValue("locations", "classpath*:META-INF/spring.integration.properties") .getBeanDefinition(); @@ -374,7 +363,7 @@ private void xpath(int registryId) throws LinkageError { private void registerRoleController() { if (!this.beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_LIFECYCLE_ROLE_CONTROLLER)) { this.registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_LIFECYCLE_ROLE_CONTROLLER, - new RootBeanDefinition(SmartLifecycleRoleController.class, SmartLifecycleRoleController::new)); + new RootBeanDefinition(SmartLifecycleRoleController.class)); } } @@ -384,7 +373,7 @@ private void registerRoleController() { private void registerMessageBuilderFactory() { if (!this.beanFactory.containsBean(IntegrationUtils.INTEGRATION_MESSAGE_BUILDER_FACTORY_BEAN_NAME)) { BeanDefinitionBuilder mbfBuilder = BeanDefinitionBuilder - .genericBeanDefinition(DefaultMessageBuilderFactory.class, DefaultMessageBuilderFactory::new) + .genericBeanDefinition(DefaultMessageBuilderFactory.class) .addPropertyValue("readOnlyHeaders", IntegrationProperties.getExpressionFor(IntegrationProperties.READ_ONLY_HEADERS)); this.registry.registerBeanDefinition( @@ -401,7 +390,7 @@ private void registerHeaderChannelRegistry() { "' has been explicitly defined. Therefore, a default DefaultHeaderChannelRegistry will be created."); this.registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_HEADER_CHANNEL_REGISTRY_BEAN_NAME, - new RootBeanDefinition(DefaultHeaderChannelRegistry.class, DefaultHeaderChannelRegistry::new)); + new RootBeanDefinition(DefaultHeaderChannelRegistry.class)); } } @@ -412,8 +401,7 @@ private void registerGlobalChannelInterceptorProcessor() { if (!this.registry.containsBeanDefinition( IntegrationContextUtils.GLOBAL_CHANNEL_INTERCEPTOR_PROCESSOR_BEAN_NAME)) { BeanDefinitionBuilder builder = - BeanDefinitionBuilder.genericBeanDefinition(GlobalChannelInterceptorProcessor.class, - GlobalChannelInterceptorProcessor::new) + BeanDefinitionBuilder.genericBeanDefinition(GlobalChannelInterceptorProcessor.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); this.registry.registerBeanDefinition(IntegrationContextUtils.GLOBAL_CHANNEL_INTERCEPTOR_PROCESSOR_BEAN_NAME, @@ -430,8 +418,7 @@ private void registerDefaultDatatypeChannelMessageConverter() { this.registry.registerBeanDefinition( IntegrationContextUtils.INTEGRATION_DATATYPE_CHANNEL_MESSAGE_CONVERTER_BEAN_NAME, - new RootBeanDefinition(DefaultDatatypeChannelMessageConverter.class, - DefaultDatatypeChannelMessageConverter::new)); + new RootBeanDefinition(DefaultDatatypeChannelMessageConverter.class)); } } @@ -442,8 +429,7 @@ private void registerDefaultDatatypeChannelMessageConverter() { private void registerArgumentResolverMessageConverter() { if (!this.beanFactory.containsBean(IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME)) { this.registry.registerBeanDefinition(IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME, - new RootBeanDefinition(ConfigurableCompositeMessageConverter.class, - ConfigurableCompositeMessageConverter::new)); + new RootBeanDefinition(ConfigurableCompositeMessageConverter.class)); } } @@ -466,8 +452,7 @@ private void registerListMessageHandlerMethodFactory() { } private static BeanDefinitionBuilder createMessageHandlerMethodFactoryBeanDefinition(boolean listCapable) { - return BeanDefinitionBuilder.genericBeanDefinition(IntegrationMessageHandlerMethodFactory.class, - () -> new IntegrationMessageHandlerMethodFactory(listCapable)) + return BeanDefinitionBuilder.genericBeanDefinition(IntegrationMessageHandlerMethodFactory.class) .addConstructorArgValue(listCapable) .addPropertyReference("messageConverter", IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java index f6d5fd5054d..9b50a971b2e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -45,6 +45,7 @@ * to Consumer Endpoints are present. * * @author Artem Bilan + * @author Chris Bono * * @since 4.1 */ @@ -83,8 +84,7 @@ else if (beanDefinition instanceof AnnotatedBeanDefinition) { if (!idempotentEndpointsMapping.isEmpty()) { BeanDefinition bd = - BeanDefinitionBuilder.rootBeanDefinition(IdempotentReceiverAutoProxyCreator.class, - IdempotentReceiverAutoProxyCreator::new) + BeanDefinitionBuilder.rootBeanDefinition(IdempotentReceiverAutoProxyCreator.class) .addPropertyValue("idempotentEndpointsMapping", idempotentEndpointsMapping) .getBeanDefinition(); registry.registerBeanDefinition(IDEMPOTENT_RECEIVER_AUTO_PROXY_CREATOR_BEAN_NAME, bd); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/InboundChannelAdapterAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/InboundChannelAdapterAnnotationPostProcessor.java index c2d8a742ebf..84fb9a75107 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/InboundChannelAdapterAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/InboundChannelAdapterAnnotationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.parsing.ComponentDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.MergedAnnotations; @@ -122,12 +121,12 @@ public Object postProcess(Object bean, String beanName, Method method, List createMessageSource(Object bean, String beanName, Method method) { - MethodInvokingMessageSource methodInvokingMessageSource = new MethodInvokingMessageSource(); - methodInvokingMessageSource.setObject(bean); - methodInvokingMessageSource.setMethod(method); + BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(MethodInvokingMessageSource.class) + .addPropertyValue("object", bean) + .addPropertyValue("method", method) + .getBeanDefinition(); String messageSourceBeanName = generateHandlerBeanName(beanName, method); - getDefinitionRegistry().registerBeanDefinition(messageSourceBeanName, - new RootBeanDefinition(MethodInvokingMessageSource.class, () -> methodInvokingMessageSource)); + getDefinitionRegistry().registerBeanDefinition(messageSourceBeanName, beanDefinition); return getBeanFactory().getBean(messageSourceBeanName, MessageSource.class); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationComponentScanRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationComponentScanRegistrar.java index ed06da015e7..571d6110917 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationComponentScanRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationComponentScanRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -65,6 +65,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -109,7 +110,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B } registry.registerBeanDefinition(BEAN_NAME, - BeanDefinitionBuilder.genericBeanDefinition(IntegrationComponentScanRegistrar.class, () -> this) + BeanDefinitionBuilder.genericBeanDefinition(IntegrationComponentScanRegistrar.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE) .getBeanDefinition()); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigUtils.java index a7bce6c1ca8..386c90e976d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -29,6 +29,7 @@ * Shared utility methods for Integration configuration. * * @author Artem Bilan + * @author Chris Bono * * @since 4.0 */ @@ -57,15 +58,14 @@ public static void registerSpelFunctionBean(BeanDefinitionRegistry registry, Str String methodSignature) { BeanDefinitionBuilder builder = - BeanDefinitionBuilder.genericBeanDefinition(SpelFunctionFactoryBean.class, - () -> new SpelFunctionFactoryBean(aClass, methodSignature)) + BeanDefinitionBuilder.genericBeanDefinition(SpelFunctionFactoryBean.class) .addConstructorArgValue(aClass) .addConstructorArgValue(methodSignature); registry.registerBeanDefinition(functionId, builder.getBeanDefinition()); } public static void autoCreateDirectChannel(String channelName, BeanDefinitionRegistry registry) { - registry.registerBeanDefinition(channelName, new RootBeanDefinition(DirectChannel.class, DirectChannel::new)); + registry.registerBeanDefinition(channelName, new RootBeanDefinition(DirectChannel.class)); } public static BeanNameGenerator annotationBeanNameGenerator(BeanDefinitionRegistry registry) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java index cf81a3e3982..8fa83c17162 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -38,6 +38,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -60,13 +61,12 @@ public void initialize(ConfigurableListableBeanFactory beanFactory) throws Beans if (!registry.containsBeanDefinition(IntegrationContextUtils.CONVERTER_REGISTRAR_BEAN_NAME)) { registry.registerBeanDefinition(IntegrationContextUtils.CONVERTER_REGISTRAR_BEAN_NAME, - new RootBeanDefinition(ConverterRegistrar.class, ConverterRegistrar::new)); + new RootBeanDefinition(ConverterRegistrar.class)); } if (!registry.containsBeanDefinition(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME)) { registry.registerBeanDefinition(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME, - new RootBeanDefinition(CustomConversionServiceFactoryBean.class, - CustomConversionServiceFactoryBean::new)); + new RootBeanDefinition(CustomConversionServiceFactoryBean.class)); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java index 3cd595328b8..236959a9217 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 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. @@ -31,6 +31,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -73,8 +74,7 @@ public void registerBeanDefinitions(@Nullable AnnotationMetadata importingClassM private void registerDefaultConfiguringBeanFactoryPostProcessor(BeanDefinitionRegistry registry) { if (!registry.containsBeanDefinition(IntegrationContextUtils.DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME)) { BeanDefinitionBuilder postProcessorBuilder = - BeanDefinitionBuilder.genericBeanDefinition(DefaultConfiguringBeanFactoryPostProcessor.class, - DefaultConfiguringBeanFactoryPostProcessor::new) + BeanDefinitionBuilder.genericBeanDefinition(DefaultConfiguringBeanFactoryPostProcessor.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(IntegrationContextUtils.DEFAULT_CONFIGURING_POSTPROCESSOR_BEAN_NAME, postProcessorBuilder.getBeanDefinition()); @@ -90,8 +90,7 @@ private void registerIntegrationConfigurationBeanFactoryPostProcessor(BeanDefini IntegrationContextUtils.INTEGRATION_CONFIGURATION_POST_PROCESSOR_BEAN_NAME)) { BeanDefinitionBuilder postProcessorBuilder = - BeanDefinitionBuilder.genericBeanDefinition(IntegrationConfigurationBeanFactoryPostProcessor.class, - IntegrationConfigurationBeanFactoryPostProcessor::new) + BeanDefinitionBuilder.genericBeanDefinition(IntegrationConfigurationBeanFactoryPostProcessor.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_CONFIGURATION_POST_PROCESSOR_BEAN_NAME, postProcessorBuilder.getBeanDefinition()); @@ -108,8 +107,7 @@ private void registerIntegrationConfigurationBeanFactoryPostProcessor(BeanDefini private void registerMessagingAnnotationPostProcessors(BeanDefinitionRegistry registry) { if (!registry.containsBeanDefinition(IntegrationContextUtils.MESSAGING_ANNOTATION_POSTPROCESSOR_NAME)) { BeanDefinitionBuilder builder = - BeanDefinitionBuilder.genericBeanDefinition(MessagingAnnotationPostProcessor.class, - MessagingAnnotationPostProcessor::new) + BeanDefinitionBuilder.genericBeanDefinition(MessagingAnnotationPostProcessor.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(IntegrationContextUtils.MESSAGING_ANNOTATION_POSTPROCESSOR_NAME, diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryRegistrar.java index dd5e986bdbf..822d37d00e0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryRegistrar.java @@ -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. @@ -35,6 +35,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -61,8 +62,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B } BeanDefinition messageHistoryConfigurer = - BeanDefinitionBuilder.genericBeanDefinition(MessageHistoryConfigurer.class, - MessageHistoryConfigurer::new) + BeanDefinitionBuilder.genericBeanDefinition(MessageHistoryConfigurer.class) .addPropertyValue("componentNamePatterns", patterns) .getBeanDefinition(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherRegistrar.java index 847d1e5b416..157a0479ee1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherRegistrar.java @@ -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. @@ -32,6 +32,7 @@ /** * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -52,8 +53,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B : (String) annotationAttributes.get("defaultChannel"); BeanDefinitionBuilder builder = - BeanDefinitionBuilder.genericBeanDefinition(PublisherAnnotationBeanPostProcessor.class, - PublisherAnnotationBeanPostProcessor::new) + BeanDefinitionBuilder.genericBeanDefinition(PublisherAnnotationBeanPostProcessor.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); if (StringUtils.hasText(defaultChannel)) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java index 3278746246d..943fbeeb030 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-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. @@ -269,7 +269,7 @@ private static BeanDefinition getMethodMetadataBeanDefinition(String defaultPayl Map[] defaultHeaders) { BeanDefinitionBuilder methodMetadataBuilder = - BeanDefinitionBuilder.genericBeanDefinition(GatewayMethodMetadata.class, GatewayMethodMetadata::new); + BeanDefinitionBuilder.genericBeanDefinition(GatewayMethodMetadata.class); if (StringUtils.hasText(defaultPayloadExpression)) { methodMetadataBuilder.addPropertyValue("payloadExpression", diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java index 9ecd8b13661..7fc0e45b776 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-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. @@ -35,6 +35,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * @since 5.0 * * @see org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor @@ -60,13 +61,11 @@ public void initialize(ConfigurableListableBeanFactory configurableListableBeanF BeanDefinitionRegistry registry = (BeanDefinitionRegistry) configurableListableBeanFactory; if (!registry.containsBeanDefinition(INTEGRATION_FLOW_BPP_BEAN_NAME)) { registry.registerBeanDefinition(INTEGRATION_FLOW_BPP_BEAN_NAME, - new RootBeanDefinition(IntegrationFlowBeanPostProcessor.class, - IntegrationFlowBeanPostProcessor::new)); + new RootBeanDefinition(IntegrationFlowBeanPostProcessor.class)); registry.registerBeanDefinition(INTEGRATION_FLOW_CONTEXT_BEAN_NAME, - new RootBeanDefinition(StandardIntegrationFlowContext.class, StandardIntegrationFlowContext::new)); + new RootBeanDefinition(StandardIntegrationFlowContext.class)); registry.registerBeanDefinition(INTEGRATION_FLOW_REPLY_PRODUCER_CLEANER_BEAN_NAME, - new RootBeanDefinition(IntegrationFlowDefinition.ReplyProducerCleaner.class, - IntegrationFlowDefinition.ReplyProducerCleaner::new)); + new RootBeanDefinition(IntegrationFlowDefinition.ReplyProducerCleaner.class)); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java index 9b7322e3759..b2984d818ef 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-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. @@ -85,6 +85,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 5.0 */ @@ -394,7 +395,6 @@ private void invokeBeanInitializationHooks(final String beanName, final Object b } } - @SuppressWarnings("unchecked") private boolean noBeanPresentForComponent(Object instance, String parentBeanName) { if (instance instanceof NamedComponent namedComponent) { String beanName = namedComponent.getBeanName(); @@ -408,8 +408,7 @@ private boolean noBeanPresentForComponent(Object instance, String parentBeanName && !instance.equals(this.beanFactory.getBean(beanName))) { AbstractBeanDefinition beanDefinition = - BeanDefinitionBuilder.genericBeanDefinition((Class) instance.getClass(), - () -> instance) + BeanDefinitionBuilder.genericBeanDefinition(instance.getClass()) .getBeanDefinition(); beanDefinition.setResourceDescription("the '" + parentBeanName + "' bean definition"); throw new BeanDefinitionOverrideException(beanName, beanDefinition, existingBeanDefinition); @@ -421,8 +420,7 @@ private boolean noBeanPresentForComponent(Object instance, String parentBeanName } return !this.beanFactory.getBeansOfType(instance.getClass(), false, false) - .values() - .contains(instance); + .containsValue(instance); } private void registerComponent(Object component, String beanName) { diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyIntegrationConfigurationInitializer.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyIntegrationConfigurationInitializer.java index 17413374f76..6fb0ce16a43 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyIntegrationConfigurationInitializer.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyIntegrationConfigurationInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-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. @@ -31,6 +31,7 @@ * The Groovy Module Integration infrastructure {@code beanFactory} initializer. * * @author Artem Bilan + * @author Chris Bono * * @since 5.0 */ @@ -52,8 +53,7 @@ public void initialize(ConfigurableListableBeanFactory beanFactory) throws Beans protected void registerScriptExecutorProviderIfNecessary(BeanDefinitionRegistry registry) { if (!registry.containsBeanDefinition(ScriptExecutingProcessorFactory.BEAN_NAME)) { registry.registerBeanDefinition(ScriptExecutingProcessorFactory.BEAN_NAME, - new RootBeanDefinition(GroovyAwareScriptExecutingProcessorFactory.class, - GroovyAwareScriptExecutingProcessorFactory::new)); + new RootBeanDefinition(GroovyAwareScriptExecutingProcessorFactory.class)); } } diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java index 69a5d80f37d..f8c14709bf7 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java @@ -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. @@ -31,6 +31,7 @@ * The HTTP Integration infrastructure {@code beanFactory} initializer. * * @author Artem Bilan + * @author Chris Bono * * @since 4.0 */ @@ -62,8 +63,7 @@ private void registerRequestMappingHandlerMappingIfNecessary(BeanDefinitionRegis if (HttpContextUtils.WEB_MVC_PRESENT && !registry.containsBeanDefinition(HttpContextUtils.HANDLER_MAPPING_BEAN_NAME)) { BeanDefinitionBuilder requestMappingBuilder = - BeanDefinitionBuilder.genericBeanDefinition(IntegrationRequestMappingHandlerMapping.class, - IntegrationRequestMappingHandlerMapping::new) + BeanDefinitionBuilder.genericBeanDefinition(IntegrationRequestMappingHandlerMapping.class) .addPropertyValue("order", 0) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(HttpContextUtils.HANDLER_MAPPING_BEAN_NAME, diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java index c63f3e4b99d..23dc01bace5 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-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. @@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -49,6 +48,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.3 */ @@ -73,7 +73,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B if (!registry.containsBeanDefinition(IntegrationContextUtils.INTEGRATION_GRAPH_SERVER_BEAN_NAME)) { registry.registerBeanDefinition(IntegrationContextUtils.INTEGRATION_GRAPH_SERVER_BEAN_NAME, - new RootBeanDefinition(IntegrationGraphServer.class, IntegrationGraphServer::new)); + new RootBeanDefinition(IntegrationGraphServer.class)); } String path = (String) annotationAttributes.get("value"); @@ -91,20 +91,14 @@ private static void registerIntegrationGraphController(BeanDefinitionRegistry re String graphControllerPath) { AbstractBeanDefinition controllerPropertiesPopulator = - BeanDefinitionBuilder.genericBeanDefinition(GraphControllerPropertiesPopulator.class, - () -> new GraphControllerPropertiesPopulator(graphControllerPath)) + BeanDefinitionBuilder.genericBeanDefinition(GraphControllerPropertiesPopulator.class) .addConstructorArgValue(graphControllerPath) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE) .getBeanDefinition(); BeanDefinitionReaderUtils.registerWithGeneratedName(controllerPropertiesPopulator, registry); BeanDefinition graphController = - BeanDefinitionBuilder.rootBeanDefinition(IntegrationGraphController.class, - () -> - new IntegrationGraphController( - ((BeanFactory) registry) - .getBean(IntegrationContextUtils.INTEGRATION_GRAPH_SERVER_BEAN_NAME, - IntegrationGraphServer.class))) + BeanDefinitionBuilder.rootBeanDefinition(IntegrationGraphController.class) .addConstructorArgReference(IntegrationContextUtils.INTEGRATION_GRAPH_SERVER_BEAN_NAME) .getBeanDefinition(); @@ -132,16 +126,14 @@ else if (HttpContextUtils.WEB_FLUX_PRESENT) { } private static AbstractBeanDefinition webMvcControllerCorsConfigurerBean(String path, String[] allowedOrigins) { - return BeanDefinitionBuilder.genericBeanDefinition(WebMvcIntegrationGraphCorsConfigurer.class, - () -> new WebMvcIntegrationGraphCorsConfigurer(path, allowedOrigins)) + return BeanDefinitionBuilder.genericBeanDefinition(WebMvcIntegrationGraphCorsConfigurer.class) .addConstructorArgValue(path) .addConstructorArgValue(allowedOrigins) .getBeanDefinition(); } private static AbstractBeanDefinition webFluxControllerCorsConfigurerBean(String path, String[] allowedOrigins) { - return BeanDefinitionBuilder.genericBeanDefinition(WebFluxIntegrationGraphCorsConfigurer.class, - () -> new WebFluxIntegrationGraphCorsConfigurer(path, allowedOrigins)) + return BeanDefinitionBuilder.genericBeanDefinition(WebFluxIntegrationGraphCorsConfigurer.class) .addConstructorArgValue(path) .addConstructorArgValue(allowedOrigins) .getBeanDefinition(); diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxIntegrationConfigurationInitializer.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxIntegrationConfigurationInitializer.java index 772fa4e183d..f7876adad08 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxIntegrationConfigurationInitializer.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxIntegrationConfigurationInitializer.java @@ -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. @@ -28,6 +28,7 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.0 */ @@ -45,7 +46,7 @@ private static void registerMBeanExporterHelperIfNecessary(ConfigurableListableB && beanFactory.getBeanNamesForType(IntegrationMBeanExporter.class, false, false).length > 0) { ((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(MBEAN_EXPORTER_HELPER_BEAN_NAME, - new RootBeanDefinition(MBeanExporterHelper.class, MBeanExporterHelper::new)); + new RootBeanDefinition(MBeanExporterHelper.class)); } } diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java index daff861808a..70eaa6d8812 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 the original author or authors. + * Copyright 2017-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. @@ -36,6 +36,7 @@ * The WebFlux Integration infrastructure {@code beanFactory} initializer. * * @author Artem Bilan + * @author Chris Bono * * @since 5.0 */ @@ -70,15 +71,14 @@ private void registerReactiveRequestMappingHandlerMappingIfNecessary(BeanDefinit !registry.containsBeanDefinition(WebFluxContextUtils.HANDLER_MAPPING_BEAN_NAME)) { BeanDefinitionBuilder requestMappingBuilder = - BeanDefinitionBuilder.genericBeanDefinition(WebFluxIntegrationRequestMappingHandlerMapping.class, - WebFluxIntegrationRequestMappingHandlerMapping::new) + BeanDefinitionBuilder.genericBeanDefinition(WebFluxIntegrationRequestMappingHandlerMapping.class) .addPropertyValue("order", 0) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(WebFluxContextUtils.HANDLER_MAPPING_BEAN_NAME, requestMappingBuilder.getBeanDefinition()); BeanDefinitionReaderUtils.registerWithGeneratedName( - new RootBeanDefinition(IntegrationHandlerResultHandler.class, IntegrationHandlerResultHandler::new), + new RootBeanDefinition(IntegrationHandlerResultHandler.class), registry); } } diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java index 647a3f2c818..13fc2eb99bb 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketIntegrationConfigurationInitializer.java @@ -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 @@ * * @author Artem Bilan * @author Gary Russell + * @author Chris Bono * * @since 4.1 */ @@ -85,8 +86,7 @@ private void registerEnableWebSocketIfNecessary(BeanDefinitionRegistry registry) 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 @@ private void registerEnableWebSocketIfNecessary(BeanDefinitionRegistry registry) !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); diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WsIntegrationConfigurationInitializer.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WsIntegrationConfigurationInitializer.java index 4ccb8c1837f..8a2efac4818 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WsIntegrationConfigurationInitializer.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WsIntegrationConfigurationInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-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. @@ -37,8 +37,8 @@ * registers only the {@link org.springframework.ws.server.endpoint.adapter.DefaultMethodEndpointAdapter}, * which isn't appropriate for the {@link org.springframework.ws.server.endpoint.MessageEndpoint} implementations. * - * * @author Artem Bilan + * @author Chris Bono * * @since 4.3 * @@ -56,8 +56,7 @@ public void initialize(ConfigurableListableBeanFactory beanFactory) throws Beans if (beanFactory instanceof BeanDefinitionRegistry) { if (beanFactory.getBeanNamesForType(EndpointAdapter.class, false, false).length > 0) { BeanDefinitionBuilder requestMappingBuilder = - BeanDefinitionBuilder.genericBeanDefinition(MessageEndpointAdapter.class, - MessageEndpointAdapter::new) + BeanDefinitionBuilder.genericBeanDefinition(MessageEndpointAdapter.class) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE); ((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(MESSAGE_ENDPOINT_ADAPTER_BEAN_NAME, requestMappingBuilder.getBeanDefinition());