Skip to content

Commit 64136a9

Browse files
committed
Remove public modifier from referenced configurations in auto-configurations
Closes gh-47715
1 parent dfb4213 commit 64136a9

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected static class RabbitTemplateConfiguration {
141141

142142
@Bean
143143
@ConditionalOnMissingBean
144-
public RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties properties,
144+
RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties properties,
145145
ObjectProvider<MessageConverter> messageConverter,
146146
ObjectProvider<RabbitTemplateRetrySettingsCustomizer> retrySettingsCustomizers) {
147147
RabbitTemplateConfigurer configurer = new RabbitTemplateConfigurer(properties);
@@ -153,7 +153,7 @@ public RabbitTemplateConfigurer rabbitTemplateConfigurer(RabbitProperties proper
153153
@Bean
154154
@ConditionalOnSingleCandidate(ConnectionFactory.class)
155155
@ConditionalOnMissingBean(RabbitOperations.class)
156-
public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory,
156+
RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, ConnectionFactory connectionFactory,
157157
ObjectProvider<RabbitTemplateCustomizer> customizers) {
158158
RabbitTemplate template = new RabbitTemplate();
159159
configurer.configure(template, connectionFactory);
@@ -165,7 +165,7 @@ public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, Connec
165165
@ConditionalOnSingleCandidate(ConnectionFactory.class)
166166
@ConditionalOnBooleanProperty(name = "spring.rabbitmq.dynamic", matchIfMissing = true)
167167
@ConditionalOnMissingBean
168-
public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
168+
AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
169169
return new RabbitAdmin(connectionFactory);
170170
}
171171

@@ -179,7 +179,7 @@ protected static class RabbitMessagingTemplateConfiguration {
179179

180180
@Bean
181181
@ConditionalOnSingleCandidate(RabbitTemplate.class)
182-
public RabbitMessagingTemplate rabbitMessagingTemplate(RabbitTemplate rabbitTemplate) {
182+
RabbitMessagingTemplate rabbitMessagingTemplate(RabbitTemplate rabbitTemplate) {
183183
return new RabbitMessagingTemplate(rabbitTemplate);
184184
}
185185

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void setBeanClassLoader(ClassLoader classLoader) {
4747
}
4848

4949
@Bean(destroyMethod = "shutdown")
50-
public EmbeddedDatabase dataSource(DataSourceProperties properties) {
50+
EmbeddedDatabase dataSource(DataSourceProperties properties) {
5151
EmbeddedDatabaseType type = EmbeddedDatabaseConnection.get(this.classLoader).getType();
5252
String databaseName = properties.determineDatabaseName();
5353
Assert.state(type != null, "'type' must not be null");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class JettyWebServerConfiguration {
4040

4141
private final JettyServerProperties jettyProperties;
4242

43-
public JettyWebServerConfiguration(JettyServerProperties jettyProperties) {
43+
JettyWebServerConfiguration(JettyServerProperties jettyProperties) {
4444
this.jettyProperties = jettyProperties;
4545
}
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@
5252
public class ReactiveWebServerConfiguration {
5353

5454
@Bean
55-
public ReactiveWebServerFactoryCustomizer reactiveWebServerFactoryCustomizer(ServerProperties serverProperties,
55+
ReactiveWebServerFactoryCustomizer reactiveWebServerFactoryCustomizer(ServerProperties serverProperties,
5656
ObjectProvider<SslBundles> sslBundles) {
5757
return new ReactiveWebServerFactoryCustomizer(serverProperties, sslBundles.getIfAvailable());
5858
}
5959

6060
@Bean
6161
@ConditionalOnMissingBean
6262
@ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework")
63-
public ForwardedHeaderTransformer forwardedHeaderTransformer() {
63+
ForwardedHeaderTransformer forwardedHeaderTransformer() {
6464
return new ForwardedHeaderTransformer();
6565
}
6666

6767
/**
6868
* Registers a {@link WebServerFactoryCustomizerBeanPostProcessor}. Registered via
6969
* {@link ImportBeanDefinitionRegistrar} for early registration.
7070
*/
71-
public static class BeanPostProcessorsRegistrar implements ImportBeanDefinitionRegistrar, BeanFactoryAware {
71+
static class BeanPostProcessorsRegistrar implements ImportBeanDefinitionRegistrar, BeanFactoryAware {
7272

7373
private @Nullable ConfigurableListableBeanFactory beanFactory;
7474

0 commit comments

Comments
 (0)