Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop dans main #68

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Merge develop dans main #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb337b4
CDE 425 Opti Extraction du filename dans la clé
TristanReamot Aug 30, 2024
b19ac10
Merge pull request #67 from abes-esr/CDE-425-opti-changer-les-cles-kafka
SamuelQuetin Aug 30, 2024
f53bf36
Refactor : renommage variables Kafka dans application.properties
pierre-maraval Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/fr/abes/kafkatosudoc/kafka/KbartListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public KbartListener(UtilsMapper mapper, BaconService baconService, EmailService
*/
@KafkaListener(topics = {"${topic.name.source.kbart.toload}"}, groupId = "${topic.groupid.source.withppn}", containerFactory = "kafkaKbartListenerContainerFactory", concurrency = "${spring.kafka.concurrency.nbThread}")
public void listenKbartToCreateFromKafka(ConsumerRecord<String, LigneKbartConnect> lignesKbart) throws IOException {
String filename = lignesKbart.key();
String filename = extractFilenameFromKey(lignesKbart.key());
if (!this.workInProgressMap.containsKey(filename)) {
this.workInProgressMap.put(filename, new WorkInProgress<>());
lignesKbart.headers().forEach(header -> {
Expand Down Expand Up @@ -357,7 +357,7 @@ private void suppressionLien469(SudocService service, List<String> listError, in
@KafkaListener(topics = {"${topic.name.source.kbart.exnihilo}"}, groupId = "${topic.groupid.source.exnihilo}", containerFactory = "kafkaKbartListenerContainerFactory")
public void listenKbartFromKafkaExNihilo(ConsumerRecord<String, LigneKbartConnect> ligneKbart) {
log.debug("Entrée dans création ex nihilo");
String filename = ligneKbart.key();
String filename = extractFilenameFromKey(ligneKbart.key());

// S'il s'agit d'un premier message d'un fichier kbart, on créé un WorkInProgress avec le nom du fichier et le nombre total de ligne
if (!this.workInProgressMapExNihilo.containsKey(filename)) {
Expand Down Expand Up @@ -437,7 +437,7 @@ private void creerNoticeExNihilo(LigneKbartConnect ligneKbartConnect, String pro
*/
@KafkaListener(topics = {"${topic.name.source.kbart.imprime}"}, groupId = "${topic.groupid.source.imprime}", containerFactory = "kafkaKbartListenerContainerFactory")
public void listenKbartFromKafkaImprime(ConsumerRecord<String, LigneKbartImprime> lignesKbart) {
String filename = lignesKbart.key();
String filename = extractFilenameFromKey(lignesKbart.key());

// S'il s'agit d'un premier message d'un fichier kbart, on créé un WorkInProgress avec le nom du fichier et le nombre total de ligne
if (!this.workInProgressMapImprime.containsKey(filename)) {
Expand Down Expand Up @@ -527,4 +527,8 @@ private NoticeConcrete creerNoticeAPartirImprime(LigneKbartImprime ligneKbartImp
throw e;
}
}

private String extractFilenameFromKey (String key) {
return key.substring(0, key.lastIndexOf('_'));
}
}
6 changes: 3 additions & 3 deletions src/main/resources/application-dev.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Consumer properties
spring.kafka.consumer.bootstrap-servers=
spring.kafka.registry.url=
spring.kafka.concurrency.nbThread=
abes.kafka.bootstrap-servers=
abes.kafka.registry.url=
abes.kafka.concurrency.nbThread=

#Connexion au sudoc
sudoc.serveur=
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application-prod.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Consumer properties
spring.kafka.consumer.bootstrap-servers=
spring.kafka.registry.url=
spring.kafka.concurrency.nbThread=
abes.kafka.bootstrap-servers=
abes.kafka.registry.url=
abes.kafka.concurrency.nbThread=

#Connexion au sudoc
sudoc.serveur=
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Consumer properties
spring.kafka.consumer.bootstrap-servers=
spring.kafka.registry.url=
spring.kafka.concurrency.nbThread=
abes.kafka.bootstrap-servers=
abes.kafka.registry.url=
abes.kafka.concurrency.nbThread=

#Connexion au sudoc
sudoc.serveur=
Expand Down
Loading