diff --git a/src/main/java/ru/micord/ervu/av/kafka/config/input/InputKafkaProducerConfig.java b/src/main/java/ru/micord/ervu/av/kafka/config/input/InputKafkaProducerConfig.java index 77a1323..f2131f4 100644 --- a/src/main/java/ru/micord/ervu/av/kafka/config/input/InputKafkaProducerConfig.java +++ b/src/main/java/ru/micord/ervu/av/kafka/config/input/InputKafkaProducerConfig.java @@ -31,8 +31,7 @@ public class InputKafkaProducerConfig { private String saslMechanism; @Bean - @Qualifier("in-prod-factory") - public ProducerFactory producerFactory() { + public ProducerFactory inputProducerFactory() { Map configs = new HashMap<>(); configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); @@ -47,8 +46,7 @@ public class InputKafkaProducerConfig { } @Bean - @Qualifier("in-template") - public KafkaTemplate kafkaTemplate() { - return new KafkaTemplate<>(producerFactory()); + public KafkaTemplate inputKafkaTemplate() { + return new KafkaTemplate<>(inputProducerFactory()); } } diff --git a/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaProducerConfig.java b/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaProducerConfig.java index 8a0ee0b..b57b6a9 100644 --- a/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaProducerConfig.java +++ b/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaProducerConfig.java @@ -31,8 +31,7 @@ public class OutputKafkaProducerConfig { private String saslMechanism; @Bean - @Qualifier("out-prod-factory") - public ProducerFactory producerFactory() { + public ProducerFactory outputProducerFactory() { Map configs = new HashMap<>(); configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); @@ -47,8 +46,7 @@ public class OutputKafkaProducerConfig { } @Bean - @Qualifier("out-template") - public KafkaTemplate kafkaTemplate() { - return new KafkaTemplate<>(producerFactory()); + public KafkaTemplate outputKafkaTemplate() { + return new KafkaTemplate<>(outputProducerFactory()); } } diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index 6b9e1e2..36d4fbf 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -64,8 +64,8 @@ public class FileUploadService { private final S3Service s3Service; @Autowired - public FileUploadService(@Qualifier("out-template") KafkaTemplate kafkaTemplate, - @Qualifier("in-template") KafkaTemplate inKafkaTemplate, + public FileUploadService(@Qualifier("outputKafkaTemplate") KafkaTemplate kafkaTemplate, + @Qualifier("inputKafkaTemplate") KafkaTemplate inKafkaTemplate, NewTopic outErrorTopic, NewTopic outSuccessTopic, ReceiveScanReportRetryable receiveScanReportRetryable, S3Service s3Service, NewTopic inStatusTopic) { this.kafkaTemplate = kafkaTemplate;