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

fix after merge

Browse source
This commit is contained in:
gulnaz 2024-09-13 17:16:19 +03:00
parent 79833feb75
commit 165f807025
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
View file

@ -1,10 +1,6 @@
package ru.micord.ervu.kafka;
import org.apache.kafka.clients.CommonClientConfigs;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.config.SaslConfigs;
@ -16,14 +12,14 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.annotation.EnableKafka;
import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
import org.springframework.kafka.core.ConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.core.*;
import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
import org.springframework.kafka.requestreply.ReplyingKafkaTemplate;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
@Configuration
@EnableKafka
public class ReplyingKafkaConfig {
@ -100,8 +96,6 @@ public class ReplyingKafkaConfig {
}
@Bean
public ReplyingKafkaTemplate<String, String, String> replyingKafkaTemplate(
@Qualifier("ervu") ProducerFactory<String, String> pf,
@Qualifier("journal")
public ConcurrentMessageListenerContainer<String, String> journalReplyContainer(
ConcurrentKafkaListenerContainerFactory<String, String> factory) {
@ -114,7 +108,7 @@ public class ReplyingKafkaConfig {
@Bean
@Qualifier("org")
public ReplyingKafkaTemplate<String, String, String> orgReplyingKafkaTemplate(
@Qualifier("ervu-factory") ProducerFactory<String, String> pf,
@Qualifier("ervu") ProducerFactory<String, String> pf,
@Qualifier("org") ConcurrentMessageListenerContainer<String, String> container) {
return initReplyingKafkaTemplate(pf, container);
}
@ -122,7 +116,7 @@ public class ReplyingKafkaConfig {
@Bean
@Qualifier("journal")
public ReplyingKafkaTemplate<String, String, String> journalReplyingKafkaTemplate(
@Qualifier("ervu-factory") ProducerFactory<String, String> pf,
@Qualifier("ervu") ProducerFactory<String, String> pf,
@Qualifier("journal") ConcurrentMessageListenerContainer<String, String> container) {
return initReplyingKafkaTemplate(pf, container);
}

1
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
import com.fasterxml.jackson.databind.ObjectMapper;
import ervu.service.classifier.OkopfService;
import ru.micord.ervu.security.esia.config.EsiaConfig;
import ervu.service.classifier.RecordAttributesService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import ru.micord.ervu.kafka.model.Brhs;