Deprecate RootBeanDefinition(ResolvableType) constructor

Closes gh-30704
spring-projects · Jun 21, 2023 · 049a024 · 049a024
1 parent 20bbebb
commit 049a024
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/...-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/...-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -125,7 +125,8 @@ public static BeanDefinitionBuilder rootBeanDefinition(Class<?> beanClass, @Null
 	 * @since 5.3.9
 	 */
 	public static <T> BeanDefinitionBuilder rootBeanDefinition(ResolvableType beanType, Supplier<T> instanceSupplier) {
-		RootBeanDefinition beanDefinition = new RootBeanDefinition(beanType);
+		RootBeanDefinition beanDefinition = new RootBeanDefinition();
+		beanDefinition.setTargetType(beanType);
 		beanDefinition.setInstanceSupplier(instanceSupplier);
 		return new BeanDefinitionBuilder(beanDefinition);
 	}

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
@@ -161,7 +161,9 @@ public RootBeanDefinition(@Nullable Class<?> beanClass) {
 	 * @param beanType the type of bean to instantiate
 	 * @since 6.0
 	 * @see #setTargetType(ResolvableType)
+	 * @deprecated as of 6.0.11, in favor of an extra {@link #setTargetType(ResolvableType)} call
 	 */
+	@Deprecated(since = "6.0.11")
 	public RootBeanDefinition(@Nullable ResolvableType beanType) {
 		setTargetType(beanType);
 	}

diff --git a/...c/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java b/...c/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java
@@ -170,8 +170,9 @@ void generateBeanDefinitionMethodWhenHasNestedInnerClassTargetMethodGeneratesMet
 
 	@Test
 	void generateBeanDefinitionMethodWhenHasGenericsGeneratesMethod() {
-		RegisteredBean registeredBean = registerBean(new RootBeanDefinition(
-				ResolvableType.forClassWithGenerics(GenericBean.class, Integer.class)));
+		RootBeanDefinition beanDefinition = new RootBeanDefinition();
+		beanDefinition.setTargetType(ResolvableType.forClassWithGenerics(GenericBean.class, Integer.class));
+		RegisteredBean registeredBean = registerBean(beanDefinition);
 		BeanDefinitionMethodGenerator generator = new BeanDefinitionMethodGenerator(
 				this.methodGeneratorFactory, registeredBean, null,
 				Collections.emptyList());

diff --git a/...java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java b/...java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -172,8 +172,9 @@ private RegisteredBean registerTestBean(Class<?> beanType) {
 	}
 
 	private RegisteredBean registerTestBean(ResolvableType beanType) {
-		this.beanFactory.registerBeanDefinition("testBean",
-				new RootBeanDefinition(beanType));
+		RootBeanDefinition beanDefinition = new RootBeanDefinition();
+		beanDefinition.setTargetType(beanType);
+		this.beanFactory.registerBeanDefinition("testBean", beanDefinition);
 		return RegisteredBean.of(this.beanFactory, "testBean");
 	}