Browse Source

Remove public modifier from referenced configurations in auto-configurations

Closes gh-47715
pull/47720/head
Moritz Halbritter 2 months ago
parent
commit
64136a9901
  1. 8
      module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
  2. 2
      module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/EmbeddedDataSourceConfiguration.java
  3. 2
      module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerConfiguration.java
  4. 6
      module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java

8
module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java

@ -141,7 +141,7 @@ public final class RabbitAutoConfiguration { @@ -141,7 +141,7 @@ public final class RabbitAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties properties,
RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties properties,
ObjectProvider<MessageConverter> messageConverter,
ObjectProvider<RabbitTemplateRetrySettingsCustomizer> retrySettingsCustomizers) {
RabbitTemplateConfigurer configurer = new RabbitTemplateConfigurer(properties);
@ -153,7 +153,7 @@ public final class RabbitAutoConfiguration { @@ -153,7 +153,7 @@ public final class RabbitAutoConfiguration {
@Bean
@ConditionalOnSingleCandidate(ConnectionFactory.class)
@ConditionalOnMissingBean(RabbitOperations.class)
public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory,
RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory,
ObjectProvider<RabbitTemplateCustomizer> customizers) {
RabbitTemplate template = new RabbitTemplate();
configurer.configure(template, connectionFactory);
@ -165,7 +165,7 @@ public final class RabbitAutoConfiguration { @@ -165,7 +165,7 @@ public final class RabbitAutoConfiguration {
@ConditionalOnSingleCandidate(ConnectionFactory.class)
@ConditionalOnBooleanProperty(name = "spring.rabbitmq.dynamic", matchIfMissing = true)
@ConditionalOnMissingBean
public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
return new RabbitAdmin(connectionFactory);
}
@ -179,7 +179,7 @@ public final class RabbitAutoConfiguration { @@ -179,7 +179,7 @@ public final class RabbitAutoConfiguration {
@Bean
@ConditionalOnSingleCandidate(RabbitTemplate.class)
public RabbitMessagingTemplate rabbitMessagingTemplate(RabbitTemplate rabbitTemplate) {
RabbitMessagingTemplate rabbitMessagingTemplate(RabbitTemplate rabbitTemplate) {
return new RabbitMessagingTemplate(rabbitTemplate);
}

2
module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/EmbeddedDataSourceConfiguration.java

@ -47,7 +47,7 @@ public class EmbeddedDataSourceConfiguration implements BeanClassLoaderAware { @@ -47,7 +47,7 @@ public class EmbeddedDataSourceConfiguration implements BeanClassLoaderAware {
}
@Bean(destroyMethod = "shutdown")
public EmbeddedDatabase dataSource(DataSourceProperties properties) {
EmbeddedDatabase dataSource(DataSourceProperties properties) {
EmbeddedDatabaseType type = EmbeddedDatabaseConnection.get(this.classLoader).getType();
String databaseName = properties.determineDatabaseName();
Assert.state(type != null, "'type' must not be null");

2
module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerConfiguration.java

@ -40,7 +40,7 @@ public class JettyWebServerConfiguration { @@ -40,7 +40,7 @@ public class JettyWebServerConfiguration {
private final JettyServerProperties jettyProperties;
public JettyWebServerConfiguration(JettyServerProperties jettyProperties) {
JettyWebServerConfiguration(JettyServerProperties jettyProperties) {
this.jettyProperties = jettyProperties;
}

6
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/autoconfigure/reactive/ReactiveWebServerConfiguration.java

@ -52,7 +52,7 @@ import org.springframework.web.server.adapter.ForwardedHeaderTransformer; @@ -52,7 +52,7 @@ import org.springframework.web.server.adapter.ForwardedHeaderTransformer;
public class ReactiveWebServerConfiguration {
@Bean
public ReactiveWebServerFactoryCustomizer reactiveWebServerFactoryCustomizer(ServerProperties serverProperties,
ReactiveWebServerFactoryCustomizer reactiveWebServerFactoryCustomizer(ServerProperties serverProperties,
ObjectProvider<SslBundles> sslBundles) {
return new ReactiveWebServerFactoryCustomizer(serverProperties, sslBundles.getIfAvailable());
}
@ -60,7 +60,7 @@ public class ReactiveWebServerConfiguration { @@ -60,7 +60,7 @@ public class ReactiveWebServerConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework")
public ForwardedHeaderTransformer forwardedHeaderTransformer() {
ForwardedHeaderTransformer forwardedHeaderTransformer() {
return new ForwardedHeaderTransformer();
}
@ -68,7 +68,7 @@ public class ReactiveWebServerConfiguration { @@ -68,7 +68,7 @@ public class ReactiveWebServerConfiguration {
* Registers a {@link WebServerFactoryCustomizerBeanPostProcessor}. Registered via
* {@link ImportBeanDefinitionRegistrar} for early registration.
*/
public static class BeanPostProcessorsRegistrar implements ImportBeanDefinitionRegistrar, BeanFactoryAware {
static class BeanPostProcessorsRegistrar implements ImportBeanDefinitionRegistrar, BeanFactoryAware {
private @Nullable ConfigurableListableBeanFactory beanFactory;

Loading…
Cancel
Save