diff --git a/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java b/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java index 744bb1e..92dafcb 100644 --- a/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java +++ b/haobang-security-dm/syslog-consumer-rule/src/main/java/com/common/service/RawLogCaptureClusterStore.java @@ -3,6 +3,7 @@ package com.common.service; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; @@ -35,7 +36,8 @@ public class RawLogCaptureClusterStore { @Value("${syslog.raw-capture.cluster-activation-delay-ms:1000}") private long activationDelayMs = 1000L; - public RawLogCaptureClusterStore(StringRedisTemplate redis, ObjectMapper mapper, + public RawLogCaptureClusterStore(StringRedisTemplate redis, + @Qualifier("httpObjectMapper") ObjectMapper mapper, @Value("${syslog.raw-capture.node-id:${HOSTNAME:unknown}}") String configuredNodeId) { this.redis = redis; diff --git a/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java b/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java new file mode 100644 index 0000000..49ca496 --- /dev/null +++ b/haobang-security-dm/syslog-consumer-rule/src/test/java/com/common/service/RawLogCaptureClusterStoreWiringTest.java @@ -0,0 +1,45 @@ +package com.common.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.test.util.ReflectionTestUtils; + +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.mock; + +class RawLogCaptureClusterStoreWiringTest { + + @Test + void usesHttpObjectMapperWhenApplicationHasMultipleObjectMappers() { + try (AnnotationConfigApplicationContext context = + new AnnotationConfigApplicationContext(TestConfiguration.class, + RawLogCaptureClusterStore.class)) { + RawLogCaptureClusterStore store = context.getBean(RawLogCaptureClusterStore.class); + + assertSame(context.getBean("httpObjectMapper"), + ReflectionTestUtils.getField(store, "mapper")); + } + } + + @Configuration + static class TestConfiguration { + @Bean + ObjectMapper objectMapper() { + return new ObjectMapper(); + } + + @Bean + ObjectMapper httpObjectMapper() { + return new ObjectMapper(); + } + + @Bean + StringRedisTemplate stringRedisTemplate() { + return mock(StringRedisTemplate.class); + } + } +}