root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x 

Closes gh-45655
This commit is contained in:
Andy Wilkinson 2025-05-23 14:45:55 +01:00
parent 86cd7ecaca cd6b0fe7c3
commit 8e91d418dc
12 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractConnectionFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-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.
@ -24,8 +24,7 @@ import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.util.Assert;
/**
* Configures {@link AbstractConnectionFactory Rabbit ConnectionFactory} with sensible
* defaults.
* Base class for configurers of sub-classes of {@link AbstractConnectionFactory}.
*
* @param <T> the connection factory type.
* @author Chris Bono

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-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.
@ -22,7 +22,6 @@ import java.util.concurrent.Executor;
import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
import org.springframework.amqp.rabbit.retry.MessageRecoverer;
import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer;
import org.springframework.amqp.support.converter.MessageConverter;
@ -31,7 +30,8 @@ import org.springframework.retry.support.RetryTemplate;
import org.springframework.util.Assert;
/**
* Configure {@link RabbitListenerContainerFactory} with sensible defaults.
* Base class for configurers of sub-classes of
* {@link AbstractRabbitListenerContainerFactory}.
*
* @param <T> the container factory type.
* @author Gary Russell

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/CachingConnectionFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-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.
@ -22,7 +22,12 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.boot.context.properties.PropertyMapper;
/**
* Configures Rabbit {@link CachingConnectionFactory} with sensible defaults.
* Configures Rabbit {@link CachingConnectionFactory} with sensible defaults tuned using
* configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code CachingConnectionFactory} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Chris Bono
* @author Moritz Halbritter

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-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.
@ -21,8 +21,12 @@ import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.boot.context.properties.PropertyMapper;
/**
* Configure {@link DirectRabbitListenerContainerFactoryConfigurer} with sensible
* defaults.
* Configure {@link DirectRabbitListenerContainerFactory} with sensible defaults tuned
* using configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code DirectRabbitListenerContainerFactory} whose configuration is based upon that
* produced by auto-configuration.
*
* @author Gary Russell
* @author Stephane Nicoll

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-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.
@ -31,7 +31,12 @@ import org.springframework.util.Assert;
import org.springframework.util.unit.DataSize;
/**
* Configures {@link RabbitConnectionFactoryBean} with sensible defaults.
* Configures {@link RabbitConnectionFactoryBean} with sensible defaults tuned using
* configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code RabbitConnectionFactoryBean} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Chris Bono
* @author Moritz Halbritter

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamTemplateConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-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.
@ -23,6 +23,10 @@ import org.springframework.rabbit.stream.support.converter.StreamMessageConverte
/**
* Configure {@link RabbitStreamTemplate} with sensible defaults.
* <p>
* Can be injected into application code and used to define a custom
* {@code RabbitStreamTemplate} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Eddú Meléndez
* @since 2.7.0

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-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.
@ -29,7 +29,12 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
/**
* Configure {@link RabbitTemplate} with sensible defaults.
* Configure {@link RabbitTemplate} with sensible defaults tuned using configuration
* properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code RabbitTemplateConfigurer} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Stephane Nicoll
* @author Yanming Zhou

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-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.
@ -21,8 +21,12 @@ import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.boot.context.properties.PropertyMapper;
/**
* Configure {@link SimpleRabbitListenerContainerFactoryConfigurer} with sensible
* defaults.
* Configure {@link SimpleRabbitListenerContainerFactory} with sensible defaults tuned
* using configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code SimpleRabbitListenerContainerFactory} whose configuration is based upon that
* produced by auto-configuration.
*
* @author Stephane Nicoll
* @author Gary Russell

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
View File

@ -31,7 +31,12 @@ import org.springframework.transaction.jta.JtaTransactionManager;
import org.springframework.util.Assert;
/**
* Configure {@link DefaultJmsListenerContainerFactory} with sensible defaults.
* Configure {@link DefaultJmsListenerContainerFactory} with sensible defaults tuned using
* configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code DefaultJmsListenerContainerFactory} whose configuration is based upon that
* produced by auto-configuration.
*
* @author Stephane Nicoll
* @author Eddú Meléndez

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-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.
@ -38,7 +38,12 @@ import org.springframework.kafka.support.converter.RecordMessageConverter;
import org.springframework.kafka.transaction.KafkaAwareTransactionManager;
/**
* Configure {@link ConcurrentKafkaListenerContainerFactory} with sensible defaults.
* Configure {@link ConcurrentKafkaListenerContainerFactory} with sensible defaults tuned
* using configuration properties.
* <p>
* Can be injected into application code and used to define a custom
* {@code ConcurrentKafkaListenerContainerFactory} whose configuration is based upon that
* produced by auto-configuration.
*
* @author Gary Russell
* @author Eddú Meléndez

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientBuilderConfigurer.java
View File

@ -27,6 +27,10 @@ import org.springframework.web.client.RestClient.Builder;
/**
* Configure {@link Builder RestClient.Builder} with sensible defaults.
* <p>
* Can be injected into application code and used to define a custom
* {@code RestClient.Builder} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Moritz Halbritter
* @since 3.2.0

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateBuilderConfigurer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-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.
@ -30,6 +30,10 @@ import org.springframework.util.ObjectUtils;
/**
* Configure {@link RestTemplateBuilder} with sensible defaults.
* <p>
* Can be injected into application code and used to define a custom
* {@code RestTemplateBuilder} whose configuration is based upon that produced by
* auto-configuration.
*
* @author Stephane Nicoll
* @since 2.4.0