micord/ervu-lkrp-av
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8556: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2024-09-27 09:31:57 +03:00
parent f1a1a6bebe
commit 3794046862
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ru/micord/ervu/av/kafka/config/input/InputKafkaProducerConfig.java
View file

@ -31,8 +31,7 @@ public class InputKafkaProducerConfig {
private String saslMechanism; private String saslMechanism;
@Bean @Bean
@Qualifier("in-prod-factory") public ProducerFactory<String, String> inputProducerFactory() {
public ProducerFactory<String, String> producerFactory() {
Map<String, Object> configs = new HashMap<>(); Map<String, Object> configs = new HashMap<>();
configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
@ -47,8 +46,7 @@ public class InputKafkaProducerConfig {
} }
@Bean @Bean
@Qualifier("in-template") public KafkaTemplate<String, String> inputKafkaTemplate() {
public KafkaTemplate<String, String> kafkaTemplate() { return new KafkaTemplate<>(inputProducerFactory());
return new KafkaTemplate<>(producerFactory());
} }
} }

8
src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaProducerConfig.java
View file

@ -31,8 +31,7 @@ public class OutputKafkaProducerConfig {
private String saslMechanism; private String saslMechanism;
@Bean @Bean
@Qualifier("out-prod-factory") public ProducerFactory<String, String> outputProducerFactory() {
public ProducerFactory<String, String> producerFactory() {
Map<String, Object> configs = new HashMap<>(); Map<String, Object> configs = new HashMap<>();
configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress); configs.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
@ -47,8 +46,7 @@ public class OutputKafkaProducerConfig {
} }
@Bean @Bean
@Qualifier("out-template") public KafkaTemplate<String, String> outputKafkaTemplate() {
public KafkaTemplate<String, String> kafkaTemplate() { return new KafkaTemplate<>(outputProducerFactory());
return new KafkaTemplate<>(producerFactory());
} }
} }

4
src/main/java/ru/micord/ervu/av/service/FileUploadService.java
View file

@ -64,8 +64,8 @@ public class FileUploadService {
private final S3Service s3Service; private final S3Service s3Service;
@Autowired @Autowired
public FileUploadService(@Qualifier("out-template") KafkaTemplate<String, String> kafkaTemplate, public FileUploadService(@Qualifier("outputKafkaTemplate") KafkaTemplate<String, String> kafkaTemplate,
@Qualifier("in-template") KafkaTemplate<String, String> inKafkaTemplate, @Qualifier("inputKafkaTemplate") KafkaTemplate<String, String> inKafkaTemplate,
NewTopic outErrorTopic, NewTopic outSuccessTopic, ReceiveScanReportRetryable receiveScanReportRetryable, NewTopic outErrorTopic, NewTopic outSuccessTopic, ReceiveScanReportRetryable receiveScanReportRetryable,
S3Service s3Service, NewTopic inStatusTopic) { S3Service s3Service, NewTopic inStatusTopic) {
this.kafkaTemplate = kafkaTemplate; this.kafkaTemplate = kafkaTemplate;