From d213522dfc8d1dd45dc54d2cb48401d65d0678ac Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 8 Mar 2023 16:49:32 +0100 Subject: [PATCH] Polishing --- .../scope/ScopedProxyBeanRegistrationAotProcessor.java | 6 +++--- .../springframework/util/function/ThrowingSupplier.java | 8 ++------ .../expression/spel/ast/FunctionReference.java | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java index 23e5cf64b88..dbf2df4fa19 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.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. @@ -55,8 +55,8 @@ class ScopedProxyBeanRegistrationAotProcessor implements BeanRegistrationAotProc @Override public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { - Class beanType = registeredBean.getBeanType().toClass(); - if (beanType.equals(ScopedProxyFactoryBean.class)) { + Class beanClass = registeredBean.getBeanClass(); + if (beanClass.equals(ScopedProxyFactoryBean.class)) { String targetBeanName = getTargetBeanName(registeredBean.getMergedBeanDefinition()); BeanDefinition targetBeanDefinition = getTargetBeanDefinition(registeredBean.getBeanFactory(), targetBeanName); diff --git a/spring-core/src/main/java/org/springframework/util/function/ThrowingSupplier.java b/spring-core/src/main/java/org/springframework/util/function/ThrowingSupplier.java index e740c0aabb0..69b8760cfd0 100644 --- a/spring-core/src/main/java/org/springframework/util/function/ThrowingSupplier.java +++ b/spring-core/src/main/java/org/springframework/util/function/ThrowingSupplier.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. @@ -20,8 +20,7 @@ import java.util.function.BiFunction; import java.util.function.Supplier; /** - * A {@link Supplier} that allows invocation of code that throws a checked - * exception. + * A {@link Supplier} that allows invocation of code that throws a checked exception. * * @author Stephane Nicoll * @author Phillip Webb @@ -76,17 +75,14 @@ public interface ThrowingSupplier extends Supplier { */ default ThrowingSupplier throwing(BiFunction exceptionWrapper) { return new ThrowingSupplier<>() { - @Override public T getWithException() throws Exception { return ThrowingSupplier.this.getWithException(); } - @Override public T get() { return get(exceptionWrapper); } - }; } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java index 892f8bab860..4ad5b0dda90 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.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. @@ -144,7 +144,7 @@ public class FunctionReference extends SpelNodeImpl { for (int i = 0; i < getChildCount(); i++) { sj.add(getChild(i).toStringAST()); } - return '#' + this.name + sj.toString(); + return '#' + this.name + sj; } /**