diff --git a/build.gradle b/build.gradle index e628b30..733f2b5 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation 'javax.validation:validation-api' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'no.fintlabs:fint-flyt-resource-server:1.3.1' + implementation 'no.fintlabs:fint-flyt-resource-server:1.3.2' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'org.postgresql:postgresql' @@ -57,7 +57,7 @@ dependencies { implementation 'org.glassfish:javax.el:3.0.0' implementation 'org.springframework.kafka:spring-kafka' - implementation 'no.fintlabs:fint-kafka:2.4.1' + implementation 'no.fintlabs:fint-kafka:4.0.1' implementation "no.fint:fint-arkiv-resource-model-java:${apiVersion}" implementation "no.fint:fint-administrasjon-resource-model-java:${apiVersion}" diff --git a/src/main/java/no/fintlabs/kafka/ConfigurationRequestConsumerConfiguration.java b/src/main/java/no/fintlabs/kafka/ConfigurationRequestConsumerConfiguration.java index 70ee7a4..b9ee7f1 100644 --- a/src/main/java/no/fintlabs/kafka/ConfigurationRequestConsumerConfiguration.java +++ b/src/main/java/no/fintlabs/kafka/ConfigurationRequestConsumerConfiguration.java @@ -11,7 +11,6 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.kafka.listener.CommonLoggingErrorHandler; import org.springframework.kafka.listener.ConcurrentMessageListenerContainer; @Configuration @@ -32,14 +31,13 @@ public class ConfigurationRequestConsumerConfiguration { requestTopicService .ensureTopic(requestTopicNameParameters, 0, TopicCleanupPolicyParameters.builder().build()); - return requestConsumerFactoryService.createFactory( + return requestConsumerFactoryService.createRecordConsumerFactory( Long.class, ConfigurationDto.class, (ConsumerRecord consumerRecord) -> ReplyProducerRecord .builder() .value(configurationService.findById(consumerRecord.value(), true).orElse(null)) - .build(), - new CommonLoggingErrorHandler() + .build() ).createContainer(requestTopicNameParameters); } @@ -58,7 +56,7 @@ public class ConfigurationRequestConsumerConfiguration { requestTopicService .ensureTopic(requestTopicNameParameters, 0, TopicCleanupPolicyParameters.builder().build()); - return requestConsumerFactoryService.createFactory( + return requestConsumerFactoryService.createRecordConsumerFactory( Long.class, ObjectMappingDto.class, (ConsumerRecord consumerRecord) -> ReplyProducerRecord @@ -68,8 +66,7 @@ public class ConfigurationRequestConsumerConfiguration { .findById(consumerRecord.value(), false) .map(ConfigurationDto::getMapping) .orElse(null)) - .build(), - new CommonLoggingErrorHandler() + .build() ).createContainer(requestTopicNameParameters); }