From c6121da1510588a6c9e190115a88bfd62eed4e31 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 24 Jan 2024 22:30:33 +0100 Subject: [PATCH] Polishing --- .../aop/framework/CoroutinesUtils.java | 11 ++++++--- .../aop/scope/ScopedProxyTests.java | 23 +++++++------------ .../core/SimpleAliasRegistryTests.java | 3 +-- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java index ce1601222d..f1e0609616 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -32,8 +32,13 @@ import org.springframework.lang.Nullable; */ abstract class CoroutinesUtils { - static Object asFlow(Object publisher) { - return ReactiveFlowKt.asFlow((Publisher) publisher); + static Object asFlow(@Nullable Object publisher) { + if (publisher instanceof Publisher rsPublisher) { + return ReactiveFlowKt.asFlow(rsPublisher); + } + else { + throw new IllegalArgumentException("Not a Reactive Streams Publisher: " + publisher); + } } @Nullable diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java index e595404cb6..9e2e1bb871 100644 --- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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,7 @@ class ScopedProxyTests { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(MAP_CONTEXT); Object baseMap = bf.getBean("singletonMap"); - boolean condition = baseMap instanceof Map; - assertThat(condition).isTrue(); + assertThat(baseMap instanceof Map).isTrue(); } @Test @@ -64,10 +63,8 @@ class ScopedProxyTests { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(MAP_CONTEXT); Object simpleMap = bf.getBean("simpleMap"); - boolean condition1 = simpleMap instanceof Map; - assertThat(condition1).isTrue(); - boolean condition = simpleMap instanceof HashMap; - assertThat(condition).isTrue(); + assertThat(simpleMap instanceof Map).isTrue(); + assertThat(simpleMap instanceof HashMap).isTrue(); } @Test @@ -97,8 +94,7 @@ class ScopedProxyTests { ITestBean bean = (ITestBean) bf.getBean("testBean"); assertThat(bean).isNotNull(); assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition1 = bean instanceof ScopedObject; - assertThat(condition1).isTrue(); + assertThat(bean instanceof ScopedObject).isTrue(); ScopedObject scoped = (ScopedObject) bean; assertThat(scoped.getTargetObject().getClass()).isEqualTo(TestBean.class); bean.setAge(101); @@ -110,8 +106,7 @@ class ScopedProxyTests { assertThat(deserialized).isNotNull(); assertThat(AopUtils.isJdkDynamicProxy(deserialized)).isTrue(); assertThat(bean.getAge()).isEqualTo(101); - boolean condition = deserialized instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(deserialized instanceof ScopedObject).isTrue(); ScopedObject scopedDeserialized = (ScopedObject) deserialized; assertThat(scopedDeserialized.getTargetObject().getClass()).isEqualTo(TestBean.class); @@ -128,8 +123,7 @@ class ScopedProxyTests { TestBean tb = (TestBean) bf.getBean("testBean"); assertThat(AopUtils.isCglibProxy(tb.getFriends())).isTrue(); - boolean condition1 = tb.getFriends() instanceof ScopedObject; - assertThat(condition1).isTrue(); + assertThat(tb.getFriends() instanceof ScopedObject).isTrue(); ScopedObject scoped = (ScopedObject) tb.getFriends(); assertThat(scoped.getTargetObject().getClass()).isEqualTo(ArrayList.class); tb.getFriends().add("myFriend"); @@ -141,8 +135,7 @@ class ScopedProxyTests { assertThat(deserialized).isNotNull(); assertThat(AopUtils.isCglibProxy(deserialized)).isTrue(); assertThat(deserialized).contains("myFriend"); - boolean condition = deserialized instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(deserialized instanceof ScopedObject).isTrue(); ScopedObject scopedDeserialized = (ScopedObject) deserialized; assertThat(scopedDeserialized.getTargetObject().getClass()).isEqualTo(ArrayList.class); diff --git a/spring-core/src/test/java/org/springframework/core/SimpleAliasRegistryTests.java b/spring-core/src/test/java/org/springframework/core/SimpleAliasRegistryTests.java index d422e3b042..a9fc3167cd 100644 --- a/spring-core/src/test/java/org/springframework/core/SimpleAliasRegistryTests.java +++ b/spring-core/src/test/java/org/springframework/core/SimpleAliasRegistryTests.java @@ -375,9 +375,8 @@ class SimpleAliasRegistryTests { @Override public String resolveStringValue(String str) { - return (this.placeholders.getOrDefault(str, str)); + return this.placeholders.getOrDefault(str, str); } - } }