From fa63f6cc9ecf4d7965605b06f25cec0e348ca6e8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 23 Mar 2023 09:46:15 +0000 Subject: [PATCH] Stop using an instance supplier in EntityScanPackages' bean definition Closes gh-34371 --- .../boot/autoconfigure/domain/EntityScanPackages.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java index b947aad3bd1..d2ab6e88a0e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.function.Supplier; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -170,13 +169,9 @@ public class EntityScanPackages { addPackageNames(packageNames); } - @Override - public Supplier getInstanceSupplier() { - return () -> new EntityScanPackages(StringUtils.toStringArray(this.packageNames)); - } - private void addPackageNames(Collection additionalPackageNames) { this.packageNames.addAll(additionalPackageNames); + getConstructorArgumentValues().addIndexedArgumentValue(0, StringUtils.toStringArray(this.packageNames)); } }