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

Conditional loading of AVRO message converter

Browse Source 
Introducing a property to disable loading the AVRO message converter.
When spring.cloud.stream.avro.enabled is set to false, the converter
is not loaded. By default, it is enabled.

Resolves https://github.com/spring-cloud/spring-cloud-function/issues/854
This commit is contained in:
Soby Chacko
2022-09-21 17:15:06 -04:00
parent 715033c269
commit 87f6013e22
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,6 +166,7 @@ public class ContextFunctionCatalogAutoConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass(name = "org.apache.avro.Schema") @ConditionalOnClass(name = "org.apache.avro.Schema")
@ConditionalOnProperty(value = "spring.cloud.stream.avro.enabled", havingValue = "true", matchIfMissing = true)
static class AvroSchemaMessageConverterConfiguration { static class AvroSchemaMessageConverterConfiguration {
@Bean @Bean

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

@@ -37,6 +37,7 @@ import static org.mockito.Mockito.mock;
* Tests the conditional loading aspects of the {@link ContextFunctionCatalogAutoConfiguration}. * Tests the conditional loading aspects of the {@link ContextFunctionCatalogAutoConfiguration}.
* *
* @author Chris Bono * @author Chris Bono
* @author Soby Chacko
*/ */
public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests { public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests {
@@ -58,6 +59,13 @@ public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests {
.hasSingleBean(AvroSchemaMessageConverter.class)); .hasSingleBean(AvroSchemaMessageConverter.class));
} }
@Test
void avroSchemaMessageConverterBeansNotLoadedWhenAvroOnClasspathButDisabledThroughProperty() {
contextRunner.withPropertyValues("spring.cloud.stream.avro.enabled:false")
.run((context) -> assertThat(context).doesNotHaveBean(AvroSchemaServiceManager.class)
.doesNotHaveBean(AvroSchemaMessageConverter.class));
}
@Test @Test
void avroSchemaMessageConverterBeansNotLoadedWhenAvroNotOnClasspath() { void avroSchemaMessageConverterBeansNotLoadedWhenAvroNotOnClasspath() {
contextRunner.withClassLoader(new FilteredClassLoader(Schema.class)).run((context) -> contextRunner.withClassLoader(new FilteredClassLoader(Schema.class)).run((context) ->