Merge pull request #85 from abes-esr/develop

Merge dev dans test
abes-esr · Dec 13, 2024 · 4aff123 · 4aff123
2 parents b4d8e0b + f231de0
commit 4aff123
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/fr/abes/kafkatosudoc/kafka/KbartListener.java b/src/main/java/fr/abes/kafkatosudoc/kafka/KbartListener.java
@@ -465,10 +465,13 @@ public void listenKbartFromKafkaImprime(ConsumerRecord<String, LigneKbartImprime
                     Map<String, NoticeConcrete> mapNoticesImprimees = getNoticesImprimeesFromCatalogue(filename, service);
                     service.authenticateBaseSignal(serveurSudoc, portSudoc, loginSudoc, passwordSudoc, signalDb);
                     for (LigneKbartImprime ligneKbartImprime : this.workInProgressMapImprime.get(filename).getListeNotices()) {
-                        KbartAndImprimeDto kbartAndImprimeDto = new KbartAndImprimeDto();
-                        kbartAndImprimeDto.setKbart(mapper.map(ligneKbartImprime, LigneKbartImprime.class));
-                        kbartAndImprimeDto.setNotice(mapNoticesImprimees.get(ligneKbartImprime.getPpn().toString()));
-                        creerNoticeAPartirImprime(kbartAndImprimeDto, provider, filename, ligneKbartImprime.getPpn().toString(), service);
+                        NoticeConcrete noticeImprimee = mapNoticesImprimees.get(ligneKbartImprime.getPpn().toString());
+                        if (noticeImprimee != null) {
+                            KbartAndImprimeDto kbartAndImprimeDto = new KbartAndImprimeDto();
+                            kbartAndImprimeDto.setKbart(mapper.map(ligneKbartImprime, LigneKbartImprime.class));
+                            kbartAndImprimeDto.setNotice(noticeImprimee);
+                            creerNoticeAPartirImprime(kbartAndImprimeDto, provider, filename, ligneKbartImprime.getPpn().toString(), service);
+                        }
                     }
                 }
             } catch (IOException e) {

diff --git a/src/main/resources/log4j2-all.xml b/src/main/resources/log4j2-all.xml
@@ -18,7 +18,7 @@
         <!-- CONSOLE -->
         <Console name="Console">
             <PatternLayout
-                    pattern="%style{%d{ISO8601}}{black} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%C{1.}}{dark,yellow}: %msg%n%throwable" />
+                    pattern="%style{%d{ISO8601}}{white} %highlight{%-5level }[%style{%t}{bright,blue}] %style{%C{1.}}{dark,yellow}: %msg%n%throwable" />
         </Console>
 
         <!-- LOG FILE -->