Make scope fully configurable

Closes gh-36171

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/BeanRegistry.java

@@ -207,6 +207,13 @@ interface Spec<T> {
 		 */
 		Spec<T> prototype();
 
+		/**
+		 * Configure this bean with a custom scope.
+		 * @since 7.0.4
+		 * @see BeanDefinition#setScope(String)
+		 */
+		Spec<T> scope(String scope);
+
 		/**
 		 * Set the supplier to construct a bean instance.
 		 * @see AbstractBeanDefinition#setInstanceSupplier(Supplier)

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java

@@ -279,6 +279,12 @@ public Spec<T> prototype() {
 			return this;
 		}
 
+		@Override
+		public Spec<T> scope(String scope) {
+			this.beanDefinition.setScope(scope);
+			return this;
+		}
+
 		@Override
 		public Spec<T> supplier(Function<SupplierContext, T> supplier) {
 			this.beanDefinition.setInstanceSupplier(() ->

spring-beans/src/test/java/org/springframework/beans/factory/support/BeanRegistryAdapterTests.java

@@ -186,6 +186,14 @@ void prototypeScope() {
 		assertThat(beanDefinition.getScope()).isEqualTo(AbstractBeanDefinition.SCOPE_PROTOTYPE);
 	}
 
+	@Test
+	void customScope() {
+		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, this.env, ScopeBeanRegistrar.class);
+		new ScopeBeanRegistrar().register(adapter, env);
+		BeanDefinition beanDefinition = this.beanFactory.getBeanDefinition("foo");
+		assertThat(beanDefinition.getScope()).isEqualTo("custom");
+	}
+
 	@Test
 	void defaultSupplier() {
 		BeanRegistryAdapter adapter = new BeanRegistryAdapter(this.beanFactory, this.beanFactory, this.env, DefaultBeanRegistrar.class);
@@ -308,6 +316,14 @@ public void register(BeanRegistry registry, Environment env) {
 		}
 	}
 
+	private static class ScopeBeanRegistrar implements BeanRegistrar {
+
+		@Override
+		public void register(BeanRegistry registry, Environment env) {
+			registry.registerBean("foo", Foo.class, spec -> spec.scope("custom"));
+		}
+	}
+
 	private static class SupplierBeanRegistrar implements BeanRegistrar {
 
 		@Override