Adapt to latest API change

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java

@@ -16,11 +16,9 @@
 
 package org.springframework.boot.web.reactive.context;
 
-import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -67,8 +65,6 @@ public class AnnotationConfigReactiveWebApplicationContext
 
 	private final Set<String> basePackages = new LinkedHashSet<>();
 
-	private final Set<BeanRegistration> registeredBeans = new LinkedHashSet<>();
-
 	@Override
 	protected ConfigurableEnvironment createEnvironment() {
 		return new StandardReactiveWebEnvironment();
@@ -143,23 +139,6 @@ public void register(Class<?>... annotatedClasses) {
 		this.annotatedClasses.addAll(Arrays.asList(annotatedClasses));
 	}
 
-	@Override
-	@SafeVarargs
-	@SuppressWarnings("varargs")
-	public final <T> void registerBean(Class<T> annotatedClass,
-			Class<? extends Annotation>... qualifiers) {
-		this.registeredBeans.add(new BeanRegistration(annotatedClass, null, qualifiers));
-	}
-
-	@Override
-	@SafeVarargs
-	@SuppressWarnings("varargs")
-	public final <T> void registerBean(Class<T> annotatedClass, Supplier<T> supplier,
-			Class<? extends Annotation>... qualifiers) {
-		this.registeredBeans
-				.add(new BeanRegistration(annotatedClass, supplier, qualifiers));
-	}
-
 	/**
 	 * Perform a scan within the specified base packages.
 	 * <p>
@@ -242,9 +221,6 @@ private void loadBeanDefinitions(AnnotatedBeanDefinitionReader reader,
 		if (!this.basePackages.isEmpty()) {
 			scanBasePackages(scanner);
 		}
-		if (!this.registeredBeans.isEmpty()) {
-			registerBeans(reader);
-		}
 		String[] configLocations = getConfigLocations();
 		if (configLocations != null) {
 			registerConfigLocations(reader, scanner, configLocations);
@@ -269,16 +245,6 @@ private void scanBasePackages(ClassPathBeanDefinitionScanner scanner) {
 		scanner.scan(StringUtils.toStringArray(this.basePackages));
 	}
 
-	private void registerBeans(AnnotatedBeanDefinitionReader reader) {
-		if (this.logger.isDebugEnabled()) {
-			this.logger.debug("Registering supplied beans: ["
-					+ StringUtils.collectionToCommaDelimitedString(this.registeredBeans)
-					+ "]");
-		}
-		this.registeredBeans.forEach((reg) -> reader.registerBean(reg.getAnnotatedClass(),
-				reg.getSupplier(), reg.getQualifiers()));
-	}
-
 	private void registerConfigLocations(AnnotatedBeanDefinitionReader reader,
 			ClassPathBeanDefinitionScanner scanner, String[] configLocations)
 			throws LinkageError {
@@ -357,45 +323,4 @@ protected Resource getResourceByPath(String path) {
 		return new FilteredReactiveWebContextResource(path);
 	}
 
-	/**
-	 * Holder for a programmatic bean registration.
-	 *
-	 * @see #registerBean(Class, Class[])
-	 * @see #registerBean(Class, Supplier, Class[])
-	 */
-	private static class BeanRegistration {
-
-		private final Class<?> annotatedClass;
-
-		private final Supplier<?> supplier;
-
-		private final Class<? extends Annotation>[] qualifiers;
-
-		BeanRegistration(Class<?> annotatedClass, Supplier<?> supplier,
-				Class<? extends Annotation>[] qualifiers) {
-			this.annotatedClass = annotatedClass;
-			this.supplier = supplier;
-			this.qualifiers = qualifiers;
-		}
-
-		public Class<?> getAnnotatedClass() {
-			return this.annotatedClass;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Supplier getSupplier() {
-			return this.supplier;
-		}
-
-		public Class<? extends Annotation>[] getQualifiers() {
-			return this.qualifiers;
-		}
-
-		@Override
-		public String toString() {
-			return this.annotatedClass.getName();
-		}
-
-	}
-
 }

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java

@@ -16,11 +16,9 @@
 
 package org.springframework.boot.web.reactive.context;
 
-import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanNameGenerator;
@@ -37,7 +35,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * {@link ReactiveWebServerApplicationContext} that accepts annotated classes as input -
@@ -70,8 +67,6 @@ public class AnnotationConfigReactiveWebServerApplicationContext
 
 	private String[] basePackages;
 
-	private final Set<BeanRegistration> registeredBeans = new LinkedHashSet<>();
-
 	/**
 	 * Create a new {@link AnnotationConfigReactiveWebServerApplicationContext} that needs
 	 * to be populated through {@link #register} calls and then manually
@@ -202,45 +197,6 @@ public final void scan(String... basePackages) {
 		this.basePackages = basePackages;
 	}
 
-	/**
-	 * Register a bean from the given bean class.
-	 * @param annotatedClass the class of the bean
-	 * @param <T> the type of the bean
-	 * @since 2.2.0
-	 */
-	public final <T> void registerBean(Class<T> annotatedClass) {
-		this.registeredBeans.add(new BeanRegistration(annotatedClass, null, null));
-	}
-
-	/**
-	 * Register a bean from the given bean class, using the given supplier for obtaining a
-	 * new instance (typically declared as a lambda expression or method reference).
-	 * @param annotatedClass the class of the bean
-	 * @param supplier a callback for creating an instance of the bean
-	 * @param <T> the type of the bean
-	 * @since 2.2.0
-	 */
-	public final <T> void registerBean(Class<T> annotatedClass, Supplier<T> supplier) {
-		this.registeredBeans.add(new BeanRegistration(annotatedClass, supplier, null));
-	}
-
-	@Override
-	@SafeVarargs
-	@SuppressWarnings("varargs")
-	public final <T> void registerBean(Class<T> annotatedClass,
-			Class<? extends Annotation>... qualifiers) {
-		this.registeredBeans.add(new BeanRegistration(annotatedClass, null, qualifiers));
-	}
-
-	@Override
-	@SafeVarargs
-	@SuppressWarnings("varargs")
-	public final <T> void registerBean(Class<T> annotatedClass, Supplier<T> supplier,
-			Class<? extends Annotation>... qualifiers) {
-		this.registeredBeans
-				.add(new BeanRegistration(annotatedClass, supplier, qualifiers));
-	}
-
 	@Override
 	protected void prepareRefresh() {
 		this.scanner.clearCache();
@@ -256,60 +212,6 @@ protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactor
 		if (!this.annotatedClasses.isEmpty()) {
 			this.reader.register(ClassUtils.toClassArray(this.annotatedClasses));
 		}
-		if (!this.registeredBeans.isEmpty()) {
-			registerBeans(this.reader);
-		}
-	}
-
-	private void registerBeans(AnnotatedBeanDefinitionReader reader) {
-		if (this.logger.isDebugEnabled()) {
-			this.logger.debug("Registering supplied beans: ["
-					+ StringUtils.collectionToCommaDelimitedString(this.registeredBeans)
-					+ "]");
-		}
-		this.registeredBeans.forEach((reg) -> reader.registerBean(reg.getAnnotatedClass(),
-				reg.getSupplier(), reg.getQualifiers()));
-	}
-
-	/**
-	 * Holder for a programmatic bean registration.
-	 *
-	 * @see #registerBean(Class, Class[])
-	 * @see #registerBean(Class, Supplier, Class[])
-	 */
-	private static class BeanRegistration {
-
-		private final Class<?> annotatedClass;
-
-		private final Supplier<?> supplier;
-
-		private final Class<? extends Annotation>[] qualifiers;
-
-		BeanRegistration(Class<?> annotatedClass, Supplier<?> supplier,
-				Class<? extends Annotation>[] qualifiers) {
-			this.annotatedClass = annotatedClass;
-			this.supplier = supplier;
-			this.qualifiers = qualifiers;
-		}
-
-		public Class<?> getAnnotatedClass() {
-			return this.annotatedClass;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Supplier getSupplier() {
-			return this.supplier;
-		}
-
-		public Class<? extends Annotation>[] getQualifiers() {
-			return this.qualifiers;
-		}
-
-		@Override
-		public String toString() {
-			return this.annotatedClass.getName();
-		}
-
 	}
 
 }