From 2cda32ebc657c0752acacd7474baf6bd50aa5277 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 8 Mar 2022 14:38:34 +0100 Subject: [PATCH] Clean up code --- .../config/ContextFunctionCatalogAutoConfiguration.java | 2 +- ...onCatalogAutoConfigurationConditionalLoadingTests.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 62eb8ac9d..9487a85b5 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -111,7 +111,7 @@ public class ContextFunctionCatalogAutoConfiguration { if (!CollectionUtils.isEmpty(messageConverters)) { for (MessageConverter mc : messageConverters) { if (mc instanceof CompositeMessageConverter) { - List conv = ((CompositeMessageConverter) mc).getConverters().stream().toList(); + List conv = ((CompositeMessageConverter) mc).getConverters().stream().collect(Collectors.toList()); mcList.addAll(conv); } else { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java index 768ef643d..ab94f742c 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java @@ -107,27 +107,27 @@ public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests { @Test void functionScanConfigEnabledByDefault() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName()) + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName()) .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); } @Test void functionScanConfigEnabledWhenEnabledPropertySetToTrue() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName(), "spring.cloud.function.scan.enabled:true") .run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); } @Test void functionScanConfigEnabledWithScanPackagesPointingToNoFunctions() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName() + ".faux", + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName() + ".faux", "spring.cloud.function.scan.enabled:true") .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); } @Test void functionScanConfigDisabledWhenEnabledPropertySetToFalse() { - contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackageName(), + contextRunner.withPropertyValues("spring.cloud.function.scan.packages:" + TestFunction.class.getPackage().getName(), "spring.cloud.function.scan.enabled:false") .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); }