Skip to content

Commit 5d63335

Browse files
committed
Polish "Use constants for well-known scope names"
See gh-43065
1 parent 03841b1 commit 5d63335

File tree

12 files changed

+26
-24
lines changed

12 files changed

+26
-24
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/beans/BeansEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -160,7 +160,7 @@ public static final class BeanDescriptor {
160160

161161
private BeanDescriptor(String[] aliases, String scope, Class<?> type, String resource, String[] dependencies) {
162162
this.aliases = aliases;
163-
this.scope = (StringUtils.hasText(scope) ? scope : BeanDefinition.SCOPE_SINGLETON);
163+
this.scope = (StringUtils.hasText(scope) ? scope : ConfigurableBeanFactory.SCOPE_SINGLETON);
164164
this.type = type;
165165
this.resource = resource;
166166
this.dependencies = dependencies;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import com.typesafe.config.ConfigFactory;
4040

4141
import org.springframework.beans.factory.ObjectProvider;
42-
import org.springframework.beans.factory.config.BeanDefinition;
42+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
4343
import org.springframework.boot.autoconfigure.AutoConfiguration;
4444
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4545
import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.Connection;
@@ -112,7 +112,7 @@ public CqlSession cassandraSession(CqlSessionBuilder cqlSessionBuilder) {
112112

113113
@Bean
114114
@ConditionalOnMissingBean
115-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
115+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
116116
public CqlSessionBuilder cassandraSessionBuilder(DriverConfigLoader driverConfigLoader,
117117
CassandraConnectionDetails connectionDetails,
118118
ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers, ObjectProvider<SslBundles> sslBundles) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/RSocketGraphQlClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.rsocket.RSocket;
2121
import io.rsocket.transport.netty.client.TcpClientTransport;
2222

23-
import org.springframework.beans.factory.config.BeanDefinition;
23+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -48,7 +48,7 @@
4848
public class RSocketGraphQlClientAutoConfiguration {
4949

5050
@Bean
51-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
51+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
5252
@ConditionalOnMissingBean
5353
public RSocketGraphQlClient.Builder<?> rsocketGraphQlClientBuilder(
5454
RSocketRequester.Builder rsocketRequesterBuilder) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.springframework.aot.hint.RuntimeHintsRegistrar;
4545
import org.springframework.beans.BeanUtils;
4646
import org.springframework.beans.factory.ObjectProvider;
47-
import org.springframework.beans.factory.config.BeanDefinition;
47+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
4848
import org.springframework.boot.autoconfigure.AutoConfiguration;
4949
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
5050
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -151,7 +151,7 @@ ParameterNamesModule parameterNamesModule() {
151151
static class JacksonObjectMapperBuilderConfiguration {
152152

153153
@Bean
154-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
154+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
155155
@ConditionalOnMissingBean
156156
Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder(ApplicationContext applicationContext,
157157
List<Jackson2ObjectMapperBuilderCustomizer> customizers) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import reactor.netty.http.server.HttpServer;
2121

2222
import org.springframework.beans.factory.ObjectProvider;
23-
import org.springframework.beans.factory.config.BeanDefinition;
23+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,7 +47,7 @@
4747
public class RSocketRequesterAutoConfiguration {
4848

4949
@Bean
50-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
50+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
5151
@ConditionalOnMissingBean
5252
public RSocketRequester.Builder rSocketRequesterBuilder(RSocketStrategies strategies,
5353
ObjectProvider<RSocketConnectorConfigurer> connectorConfigurers) {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.autoconfigure.web.client;
1818

1919
import org.springframework.beans.factory.ObjectProvider;
20-
import org.springframework.beans.factory.config.BeanDefinition;
20+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -78,7 +78,7 @@ RestClientBuilderConfigurer restClientBuilderConfigurer(ObjectProvider<RestClien
7878
}
7979

8080
@Bean
81-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
81+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
8282
@ConditionalOnMissingBean
8383
RestClient.Builder restClientBuilder(RestClientBuilderConfigurer restClientBuilderConfigurer) {
8484
RestClient.Builder builder = RestClient.builder()

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.autoconfigure.web.reactive.function.client;
1818

1919
import org.springframework.beans.factory.ObjectProvider;
20-
import org.springframework.beans.factory.config.BeanDefinition;
20+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -49,7 +49,7 @@
4949
public class WebClientAutoConfiguration {
5050

5151
@Bean
52-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
52+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
5353
@ConditionalOnMissingBean
5454
public WebClient.Builder webClientBuilder(ObjectProvider<WebClientCustomizer> customizerProvider) {
5555
WebClient.Builder builder = WebClient.builder();

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ The following example uses HtmlUnit:
407407
include::code:MyHtmlUnitTests[]
408408

409409
NOTE: By default, Spring Boot puts `WebDriver` beans in a special "`scope`" to ensure that the driver exits after each test and that a new instance is injected.
410-
If you do not want this behavior, you can add `@Scope("singleton")` to your `WebDriver` `@Bean` definition.
410+
If you do not want this behavior, you can add `@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)` to your `WebDriver` `@Bean` definition.
411411

412412
WARNING: The `webDriver` scope created by Spring Boot will replace any user defined scope of the same name.
413413
If you define your own `webDriver` scope you may find it stops working when you use `@WebMvcTest`.

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.beans.BeanUtils;
3232
import org.springframework.beans.BeansException;
3333
import org.springframework.beans.factory.FactoryBean;
34-
import org.springframework.beans.factory.config.BeanDefinition;
3534
import org.springframework.beans.factory.config.BeanPostProcessor;
35+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
3636
import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
3737
import org.springframework.boot.autoconfigure.AutoConfiguration;
3838
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -74,7 +74,7 @@ public static JsonMarshalTestersBeanPostProcessor jsonMarshalTestersBeanPostProc
7474
}
7575

7676
@Bean
77-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
77+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
7878
@ImportRuntimeHints(BasicJsonTesterRuntimeHints.class)
7979
public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
8080
return new JsonTesterFactoryBean<BasicJsonTester, Void>(BasicJsonTester.class, null);
@@ -85,7 +85,7 @@ public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
8585
static class JacksonJsonTestersConfiguration {
8686

8787
@Bean
88-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
88+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
8989
@ConditionalOnBean(ObjectMapper.class)
9090
@ImportRuntimeHints(JacksonTesterRuntimeHints.class)
9191
FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(ObjectMapper mapper) {
@@ -107,7 +107,7 @@ static class JacksonTesterRuntimeHints extends AbstractJsonMarshalTesterRuntimeH
107107
static class GsonJsonTestersConfiguration {
108108

109109
@Bean
110-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
110+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
111111
@ConditionalOnBean(Gson.class)
112112
@ImportRuntimeHints(GsonTesterRuntimeHints.class)
113113
FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) {
@@ -129,7 +129,7 @@ static class GsonTesterRuntimeHints extends AbstractJsonMarshalTesterRuntimeHint
129129
static class JsonbJsonTesterConfiguration {
130130

131131
@Bean
132-
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
132+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
133133
@ConditionalOnBean(Jsonb.class)
134134
@ImportRuntimeHints(JsonbJsonTesterRuntimeHints.class)
135135
FactoryBean<JsonbTester<?>> jsonbTesterFactoryBean(Jsonb jsonb) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.beans.factory.FactoryBean;
2626
import org.springframework.beans.factory.annotation.Autowired;
27+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2728
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.context.annotation.Configuration;
@@ -63,7 +64,7 @@ void shouldBeTheSameWebClient() {
6364
static class Config {
6465

6566
@Bean
66-
@Scope("singleton")
67+
@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
6768
WebDriverFactory webDriver(MockMvc mockMvc) {
6869
return new WebDriverFactory(mockMvc);
6970
}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.springframework.beans.factory.ObjectProvider;
4949
import org.springframework.beans.factory.annotation.Autowired;
5050
import org.springframework.beans.factory.annotation.Value;
51+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
5152
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
5253
import org.springframework.beans.factory.support.AbstractBeanDefinition;
5354
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -1497,7 +1498,7 @@ static PropertySourcesPlaceholderConfigurer configurer2() {
14971498
static class PrototypePropertiesConfiguration {
14981499

14991500
@Bean
1500-
@Scope("prototype")
1501+
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
15011502
@ConfigurationProperties("example")
15021503
PrototypeBean prototypeBean() {
15031504
return new PrototypeBean();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)