bump fint-kafka, fint-flyt-kafka, fint-flyt-resource-server

FINTLabs · Dec 20, 2023 · 6ace929 · 6ace929
1 parent 055d574
commit 6ace929
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,11 +34,11 @@ dependencies {
     implementation 'io.netty:netty-resolver-dns-native-macos:4.1.75.Final:osx-aarch_64'
 
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'no.fintlabs:fint-flyt-resource-server:1.3.1'
+    implementation 'no.fintlabs:fint-flyt-resource-server:1.3.2'
 
     implementation 'org.springframework.kafka:spring-kafka'
-    implementation 'no.fintlabs:fint-kafka:2.4.1'
-    implementation 'no.fintlabs:fint-flyt-kafka:2.4.2'
+    implementation 'no.fintlabs:fint-kafka:4.0.1'
+    implementation 'no.fintlabs:fint-flyt-kafka:3.0.2'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.flywaydb:flyway-core'
@@ -53,9 +53,6 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.projectreactor:reactor-test'
     testImplementation 'cglib:cglib-nodep:3.3.0'
-//    testImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring5-test:9.5.0'
-//    testImplementation 'com.h2database:h2'
-
 }
 
 test {

diff --git a/src/main/java/no/fintlabs/consumers/ArchiveInstanceIdRequestConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/ArchiveInstanceIdRequestConsumerConfiguration.java
@@ -32,7 +32,7 @@ ConcurrentMessageListenerContainer<String, ArchiveInstanceIdRequestParams> archi
 
         requestTopicService.ensureTopic(topicNameParameters, 0, TopicCleanupPolicyParameters.builder().build());
 
-        return requestConsumerFactoryService.createFactory(
+        return requestConsumerFactoryService.createRecordConsumerFactory(
                 ArchiveInstanceIdRequestParams.class,
                 String.class,
                 consumerRecord -> {
@@ -42,8 +42,7 @@ ConcurrentMessageListenerContainer<String, ArchiveInstanceIdRequestParams> archi
                             )
                             .orElse(null);
                     return ReplyProducerRecord.<String>builder().value(archiveInstanceId).build();
-                },
-                null
+                }
         ).createContainer(topicNameParameters);
     }
 

diff --git a/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/ErrorEventConsumerConfiguration.java
@@ -11,7 +11,6 @@
 import no.fintlabs.repositories.EventRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.listener.CommonLoggingErrorHandler;
 import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 
 import java.nio.charset.StandardCharsets;
@@ -65,7 +64,7 @@ public ConcurrentMessageListenerContainer<String, ErrorCollection> instanceDispa
     }
 
     private ConcurrentMessageListenerContainer<String, ErrorCollection> createErrorEventListener(String errorEventName) {
-        return instanceFlowErrorEventConsumerFactoryService.createFactory(
+        return instanceFlowErrorEventConsumerFactoryService.createRecordFactory(
                 instanceFlowConsumerRecord -> {
                     Event event = new Event();
                     event.setInstanceFlowHeaders(
@@ -86,9 +85,7 @@ private ConcurrentMessageListenerContainer<String, ErrorCollection> createErrorE
                             StandardCharsets.UTF_8
                     ));
                     eventRepository.save(event);
-                },
-                new CommonLoggingErrorHandler(),
-                false
+                }
         ).createContainer(createErrorEventTopicNameParameters(errorEventName));
     }
 

diff --git a/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java b/src/main/java/no/fintlabs/consumers/InfoEventConsumerConfiguration.java
@@ -9,7 +9,6 @@
 import no.fintlabs.repositories.EventRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.listener.CommonLoggingErrorHandler;
 import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 
 import java.nio.charset.StandardCharsets;
@@ -66,7 +65,7 @@ public ConcurrentMessageListenerContainer<String, Object> instanceDispatchedEven
     }
 
     private ConcurrentMessageListenerContainer<String, Object> createInfoEventListener(String eventName) {
-        return instanceFlowEventConsumerFactoryService.createFactory(
+        return instanceFlowEventConsumerFactoryService.createRecordFactory(
                 Object.class,
                 instanceFlowConsumerRecord -> {
                     Event event = new Event();
@@ -87,9 +86,7 @@ private ConcurrentMessageListenerContainer<String, Object> createInfoEventListen
                             StandardCharsets.UTF_8
                     ));
                     eventRepository.save(event);
-                },
-                new CommonLoggingErrorHandler(),
-                false
+                }
         ).createContainer(createEventTopicNameParameters(eventName));
     }
 

diff --git a/...tlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java b/...tlabs/consumers/InstanceFlowHeadersForRegisteredInstanceRequestConsumerConfiguration.java
@@ -41,7 +41,7 @@ ConcurrentMessageListenerContainer<String, Long> instanceFlowHeadersForRegistere
 
         requestTopicService.ensureTopic(topicNameParameters, 0, TopicCleanupPolicyParameters.builder().build());
 
-        return requestConsumerFactoryService.createFactory(
+        return requestConsumerFactoryService.createRecordConsumerFactory(
                 Long.class,
                 InstanceFlowHeaders.class,
                 consumerRecord -> {
@@ -54,8 +54,7 @@ ConcurrentMessageListenerContainer<String, Long> instanceFlowHeadersForRegistere
                             .map(instanceFlowHeadersEmbeddableMapper::toInstanceFlowHeaders)
                             .orElse(null);
                     return ReplyProducerRecord.<InstanceFlowHeaders>builder().value(instanceFlowHeaders).build();
-                },
-                null
+                }
         ).createContainer(topicNameParameters);
     }