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

GH-966 change AWSCompanionAutoConfiguration to be a refular auto-configuration rather than initializer

Browse Source 
Resolves #966
This commit is contained in:
Oleg Zhurakousky
2022-12-08 11:11:53 -08:00
parent 3614683b1a
commit 25d524f395
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java
View File

@@ -20,28 +20,24 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.cloud.function.json.JacksonMapper; import org.springframework.cloud.function.json.JacksonMapper;
import org.springframework.cloud.function.json.JsonMapper; import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.annotation.Bean;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
/** /**
* *
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @since 3.2 * @since 3.2
* *
*/ */
public class AWSCompanionAutoConfiguration implements ApplicationContextInitializer<GenericApplicationContext> { public class AWSCompanionAutoConfiguration {
@Override @Bean
public void initialize(GenericApplicationContext applicationContext) { public AWSTypesMessageConverter awsTypesMessageConverter(GenericApplicationContext applicationContext) {
applicationContext.registerBean("awsTypesMessageConverter", AWSTypesMessageConverter.class, JsonMapper jsonMapper = CollectionUtils.isEmpty(applicationContext.getBeansOfType(JsonMapper.class).values())
() -> { ? new JacksonMapper(new ObjectMapper())
if (CollectionUtils.isEmpty(applicationContext.getBeansOfType(JsonMapper.class).values())) { : applicationContext.getBean(JsonMapper.class);
return new AWSTypesMessageConverter(new JacksonMapper(new ObjectMapper())); return new AWSTypesMessageConverter(jsonMapper);
}
else {
return new AWSTypesMessageConverter(applicationContext.getBean(JsonMapper.class));
}
});
} }
} }

2
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,2 @@
org.springframework.context.ApplicationContextInitializer=\ org.springframework.context.ApplicationContextInitializer=\
org.springframework.cloud.function.adapter.aws.CustomRuntimeInitializer,org.springframework.cloud.function.adapter.aws.AWSCompanionAutoConfiguration org.springframework.cloud.function.adapter.aws.CustomRuntimeInitializer

1
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@@ -0,0 +1 @@
org.springframework.cloud.function.adapter.aws.AWSCompanionAutoConfiguration