Fix injecting SnsTemplate and SnsSmsTemplate beans. (#543)

awspring · Oct 18, 2022 · 423942a · 423942a
1 parent 194eb8d
commit 423942a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/...autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/sns/SnsAutoConfiguration.java b/...autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/sns/SnsAutoConfiguration.java
@@ -70,9 +70,9 @@ public SnsClient snsClient(SnsProperties properties, AwsClientBuilderConfigurer
 				.build();
 	}
 
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(SnsOperations.class)
 	@Bean
-	public SnsOperations snsTemplate(SnsClient snsClient, Optional<ObjectMapper> objectMapper,
+	public SnsTemplate snsTemplate(SnsClient snsClient, Optional<ObjectMapper> objectMapper,
 			Optional<TopicArnResolver> topicArnResolver) {
 		MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
 		converter.setSerializedPayloadClass(String.class);
@@ -81,9 +81,9 @@ public SnsOperations snsTemplate(SnsClient snsClient, Optional<ObjectMapper> obj
 				.orElseGet(() -> new SnsTemplate(snsClient, converter));
 	}
 
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(SnsSmsOperations.class)
 	@Bean
-	public SnsSmsOperations snsSmsTemplate(SnsClient snsClient) {
+	public SnsSmsTemplate snsSmsTemplate(SnsClient snsClient) {
 		return new SnsSmsTemplate(snsClient);
 	}
 

diff --git a/...configure/src/test/java/io/awspring/cloud/autoconfigure/sns/SnsAutoConfigurationTest.java b/...configure/src/test/java/io/awspring/cloud/autoconfigure/sns/SnsAutoConfigurationTest.java
@@ -23,6 +23,7 @@
 import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
 import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
 import io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration;
+import io.awspring.cloud.sns.core.SnsOperations;
 import io.awspring.cloud.sns.core.SnsTemplate;
 import io.awspring.cloud.sns.core.TopicArnResolver;
 import io.awspring.cloud.sns.sms.SnsSmsOperations;
@@ -31,6 +32,7 @@
 import java.time.Duration;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -128,6 +130,13 @@ void smsSnsOperationsBeanCanBeOverwritten() {
 		});
 	}
 
+	@Test
+	void bothTemplatesAndOperationsAreInjectable() {
+		this.contextRunner.withUserConfiguration(InjectingTemplatesConfiguration.class).run(context -> {
+			assertThat(context.isRunning()).isTrue();
+		});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomTopicArnResolverConfiguration {
 
@@ -179,4 +188,31 @@ SnsSmsOperations customSmsOperations() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class InjectingTemplatesConfiguration {
+		@Bean
+		ApplicationRunner runner1(SnsTemplate snsTemplate) {
+			return args -> {
+			};
+		}
+
+		@Bean
+		ApplicationRunner runner2(SnsOperations snsOperations) {
+			return args -> {
+			};
+		}
+
+		@Bean
+		ApplicationRunner runner3(SnsSmsTemplate snsSmsTemplate) {
+			return args -> {
+			};
+		}
+
+		@Bean
+		ApplicationRunner runner4(SnsSmsOperations snsSmsOperations) {
+			return args -> {
+			};
+		}
+	}
+
 }