Replace "prototype" with BeanDefinition.SCOPE_PROTOTYPE

And replace `"session"` with `WebApplicationContext.SCOPE_SESSION`
spring-projects · Nov 8, 2024 · f9df549 · f9df549
1 parent 8b6c80d
commit f9df549
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 17 deletions.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
@@ -39,6 +39,7 @@
 import com.typesafe.config.ConfigFactory;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.Connection;
@@ -111,7 +112,7 @@ public CqlSession cassandraSession(CqlSessionBuilder cqlSessionBuilder) {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	public CqlSessionBuilder cassandraSessionBuilder(DriverConfigLoader driverConfigLoader,
 			CassandraConnectionDetails connectionDetails,
 			ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers, ObjectProvider<SslBundles> sslBundles) {

diff --git a/...ngframework/boot/autoconfigure/graphql/rsocket/RSocketGraphQlClientAutoConfiguration.java b/...ngframework/boot/autoconfigure/graphql/rsocket/RSocketGraphQlClientAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -20,6 +20,7 @@
 import io.rsocket.RSocket;
 import io.rsocket.transport.netty.client.TcpClientTransport;
 
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,7 +48,7 @@
 public class RSocketGraphQlClientAutoConfiguration {
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ConditionalOnMissingBean
 	public RSocketGraphQlClient.Builder<?> rsocketGraphQlClientBuilder(
 			RSocketRequester.Builder rsocketRequesterBuilder) {

diff --git a/...rc/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/...rc/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -44,6 +44,7 @@
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -150,7 +151,7 @@ ParameterNamesModule parameterNamesModule() {
 	static class JacksonObjectMapperBuilderConfiguration {
 
 		@Bean
-		@Scope("prototype")
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 		@ConditionalOnMissingBean
 		Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder(ApplicationContext applicationContext,
 				List<Jackson2ObjectMapperBuilderCustomizer> customizers) {

diff --git a/...gure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfiguration.java b/...gure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfiguration.java
@@ -27,6 +27,7 @@
 import org.apache.pulsar.common.schema.SchemaType;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.pulsar.PulsarProperties.Defaults.SchemaInfo;
@@ -180,7 +181,7 @@ PulsarFunctionAdministration pulsarFunctionAdministration(PulsarAdministration p
 	}
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(name = "spring.pulsar.defaults.topic.enabled", havingValue = "true", matchIfMissing = true)
 	PulsarTopicBuilder pulsarTopicBuilder() {

diff --git a/...ava/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfiguration.java b/...ava/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -20,6 +20,7 @@
 import reactor.netty.http.server.HttpServer;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -46,7 +47,7 @@
 public class RSocketRequesterAutoConfiguration {
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ConditionalOnMissingBean
 	public RSocketRequester.Builder rSocketRequesterBuilder(RSocketStrategies strategies,
 			ObjectProvider<RSocketConnectorConfigurer> connectorConfigurers) {

diff --git a/...n/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java b/...n/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java
@@ -17,6 +17,7 @@
 package org.springframework.boot.autoconfigure.web.client;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -86,7 +87,7 @@ RestClientBuilderConfigurer restClientBuilderConfigurer(
 	}
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ConditionalOnMissingBean
 	RestClient.Builder restClientBuilder(RestClientBuilderConfigurer restClientBuilderConfigurer) {
 		return restClientBuilderConfigurer.configure(RestClient.builder());

diff --git a/...framework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java b/...framework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -17,6 +17,7 @@
 package org.springframework.boot.autoconfigure.web.reactive.function.client;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -48,7 +49,7 @@
 public class WebClientAutoConfiguration {
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ConditionalOnMissingBean
 	public WebClient.Builder webClientBuilder(ObjectProvider<WebClientCustomizer> customizerProvider) {
 		WebClient.Builder builder = WebClient.builder();

diff --git a/...n/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/...n/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -73,7 +74,7 @@ public static JsonMarshalTestersBeanPostProcessor jsonMarshalTestersBeanPostProc
 	}
 
 	@Bean
-	@Scope("prototype")
+	@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 	@ImportRuntimeHints(BasicJsonTesterRuntimeHints.class)
 	public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
 		return new JsonTesterFactoryBean<BasicJsonTester, Void>(BasicJsonTester.class, null);
@@ -84,7 +85,7 @@ public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
 	static class JacksonJsonTestersConfiguration {
 
 		@Bean
-		@Scope("prototype")
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 		@ConditionalOnBean(ObjectMapper.class)
 		@ImportRuntimeHints(JacksonTesterRuntimeHints.class)
 		FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(ObjectMapper mapper) {
@@ -106,7 +107,7 @@ static class JacksonTesterRuntimeHints extends AbstractJsonMarshalTesterRuntimeH
 	static class GsonJsonTestersConfiguration {
 
 		@Bean
-		@Scope("prototype")
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 		@ConditionalOnBean(Gson.class)
 		@ImportRuntimeHints(GsonTesterRuntimeHints.class)
 		FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) {
@@ -128,7 +129,7 @@ static class GsonTesterRuntimeHints extends AbstractJsonMarshalTesterRuntimeHint
 	static class JsonbJsonTesterConfiguration {
 
 		@Bean
-		@Scope("prototype")
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 		@ConditionalOnBean(Jsonb.class)
 		@ImportRuntimeHints(JsonbJsonTesterRuntimeHints.class)
 		FactoryBean<JsonbTester<?>> jsonbTesterFactoryBean(Jsonb jsonb) {

diff --git a/...ork/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java b/...ork/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java
@@ -35,6 +35,7 @@
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ServletContextAware;
+import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -154,7 +155,7 @@ public void service(ServletRequest req, ServletResponse res) {
 	}
 
 	@Component
-	@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+	@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
 	static class SessionScopedComponent {
 
 	}