Polishing

Author: jhoeller

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

@@ -294,9 +294,9 @@ public static <T> Map<String, T> beansOfTypeIncludingAncestors(ListableBeanFacto
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				Map<String, T> parentResult = beansOfTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type);
-				parentResult.forEach((beanName, beanType) -> {
+				parentResult.forEach((beanName, beanInstance) -> {
 					if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) {
-						result.put(beanName, beanType);
+						result.put(beanName, beanInstance);
 					}
 				});
 			}
@@ -343,9 +343,9 @@ public static <T> Map<String, T> beansOfTypeIncludingAncestors(
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				Map<String, T> parentResult = beansOfTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
-				parentResult.forEach((beanName, beanType) -> {
+				parentResult.forEach((beanName, beanInstance) -> {
 					if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) {
-						result.put(beanName, beanType);
+						result.put(beanName, beanInstance);
 					}
 				});
 			}

spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java

@@ -199,8 +199,8 @@ public void afterPropertiesSet() {
 		if (this.applicationContextJobDataKey != null) {
 			if (this.applicationContext == null) {
 				throw new IllegalStateException(
-					"JobDetailBean needs to be set up in an ApplicationContext " +
-					"to be able to handle an 'applicationContextJobDataKey'");
+						"JobDetailBean needs to be set up in an ApplicationContext " +
+						"to be able to handle an 'applicationContextJobDataKey'");
 			}
 			getJobDataMap().put(this.applicationContextJobDataKey, this.applicationContext);
 		}

spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java

@@ -84,7 +84,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
 	}
 
 	@Override
-	public AnnotationVisitor visitAnnotation(final String desc, boolean visible) {
+	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
 		String className = Type.getType(desc).getClassName();
 		this.annotationSet.add(className);
 		return new AnnotationAttributesReadingVisitor(

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java

@@ -111,7 +111,7 @@ protected void initRouterFunctions() {
 	}
 
 	private List<RouterFunction<?>> routerFunctions() {
-		List<RouterFunction<?>> functions = this.getApplicationContext()
+		List<RouterFunction<?>> functions = obtainApplicationContext()
 				.getBeanProvider(RouterFunction.class)
 				.orderedStream()
 				.map(router -> (RouterFunction<?>)router)