From f29bfd97695ebb4c9db590eaa00f82a72617ffb9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 10 Dec 2023 00:28:51 +0100 Subject: [PATCH] Polishing --- .../beans/factory/support/SimpleInstantiationStrategy.java | 3 +-- .../cache/interceptor/CacheAspectSupport.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java index aff2ebb620..d1d98d35e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java @@ -153,8 +153,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { } } catch (IllegalArgumentException ex) { - if (factoryBean != null - && !factoryMethod.getDeclaringClass().isAssignableFrom(factoryBean.getClass())) { + if (factoryBean != null && !factoryMethod.getDeclaringClass().isAssignableFrom(factoryBean.getClass())) { throw new BeanInstantiationException(factoryMethod, "Illegal factory instance for factory method '" + factoryMethod.getName() + "'; " + "instance: " + factoryBean.getClass().getName(), ex); diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java index 546be7f5af..f10fe9e214 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java @@ -642,10 +642,10 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker } /** - * Collect the {@link CachePutRequest} for all {@link CacheOperation} using - * the specified result value. + * Collect a {@link CachePutRequest} for every {@link CacheOperation} + * using the specified result value. * @param contexts the contexts to handle - * @param result the result value (never {@code null}) + * @param result the result value * @param putRequests the collection to update */ private void collectPutRequests(Collection contexts,