SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up code

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-03-08 14:38:34 +01:00
parent fc8ffa607c
commit 2cda32ebc6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -111,7 +111,7 @@ public class ContextFunctionCatalogAutoConfiguration {
if (!CollectionUtils.isEmpty(messageConverters)) { if (!CollectionUtils.isEmpty(messageConverters)) {
for (MessageConverter mc : messageConverters) { for (MessageConverter mc : messageConverters) {
if (mc instanceof CompositeMessageConverter) { if (mc instanceof CompositeMessageConverter) {
List<MessageConverter> conv = ((CompositeMessageConverter) mc).getConverters().stream().toList(); List<MessageConverter> conv = ((CompositeMessageConverter) mc).getConverters().stream().collect(Collectors.toList());
mcList.addAll(conv); mcList.addAll(conv);
} }
else { else {

8
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java
View File

@@ -107,27 +107,27 @@ public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests {
@Test @Test
void functionScanConfigEnabledByDefault() { 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)); .run((context) -> assertThat(context).hasSingleBean(TestFunction.class));
} }
@Test @Test
void functionScanConfigEnabledWhenEnabledPropertySetToTrue() { 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") "spring.cloud.function.scan.enabled:true")
.run((context) -> assertThat(context).hasSingleBean(TestFunction.class)); .run((context) -> assertThat(context).hasSingleBean(TestFunction.class));
} }
@Test @Test
void functionScanConfigEnabledWithScanPackagesPointingToNoFunctions() { 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") "spring.cloud.function.scan.enabled:true")
.run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class));
} }
@Test @Test
void functionScanConfigDisabledWhenEnabledPropertySetToFalse() { 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") "spring.cloud.function.scan.enabled:false")
.run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class)); .run((context) -> assertThat(context).doesNotHaveBean(TestFunction.class));
} }