From 053820c4ffd98193f8c1c90f50b09203972e7283 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 9 Oct 2018 23:14:49 +0200 Subject: [PATCH] Polishing --- .../springframework/beans/factory/BeanFactoryUtils.java | 8 ++++---- .../scheduling/quartz/JobDetailFactoryBean.java | 4 ++-- .../classreading/AnnotationMetadataReadingVisitor.java | 2 +- .../function/server/support/RouterFunctionMapping.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java index 9d8ff98cdd..28b96e1d84 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java @@ -294,9 +294,9 @@ public abstract class BeanFactoryUtils { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { Map 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 abstract class BeanFactoryUtils { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { Map 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); } }); } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java index 1495c0522a..22939d06f4 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java @@ -199,8 +199,8 @@ public class JobDetailFactoryBean 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); } diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java index a24d3b2289..46d22e5663 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java @@ -84,7 +84,7 @@ public class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisito } @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( diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java index 806ff8ee68..90c626fbd0 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java @@ -111,7 +111,7 @@ public class RouterFunctionMapping extends AbstractHandlerMapping implements Ini } private List> routerFunctions() { - List> functions = this.getApplicationContext() + List> functions = obtainApplicationContext() .getBeanProvider(RouterFunction.class) .orderedStream() .map(router -> (RouterFunction)router)