More leniency, related to language codes.

npo-poms · Oct 6, 2024 · 9c7d46b · 9c7d46b
1 parent ba0609a
commit 9c7d46b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/media-berlijn/pom.xml b/media-berlijn/pom.xml
@@ -15,6 +15,11 @@
       <groupId>nl.vpro.media</groupId>
       <artifactId>media-domain</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.meeuw.i18n</groupId>
+      <artifactId>i18n-iso-639</artifactId>
+      <version>3.4</version>
+    </dependency>
     <dependency>
       <groupId>nl.vpro.media</groupId>
       <artifactId>media-classification</artifactId>

diff --git a/media-berlijn/src/main/java/nl/vpro/berlijn/domain/Parser.java b/media-berlijn/src/main/java/nl/vpro/berlijn/domain/Parser.java
@@ -9,6 +9,7 @@
 
 import jakarta.inject.Singleton;
 
+import org.meeuw.i18n.languages.ISO_639;
 import org.meeuw.i18n.languages.LanguageCode;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -77,17 +78,24 @@ public void setLenient(boolean lenient) {
 
     // For some reason Whatson simply does not conform to standard.
     private static final Map<String, LanguageCode> FALLBACKS = Map.of(
-        "XX", languageCode("zxx") // SEE https://publiekeomroep.atlassian.net/browse/VPPM-2238
+        "XX", languageCode("zxx"),
+        "ZZ", LanguageCode.UNKNOWN
+        // SEE https://publiekeomroep.atlassian.net/browse/VPPM-2238
         ///"", languageCode(null)
     );
 
     @SneakyThrows
     public ProductMetadata parseProductMetadata(byte[] json) {
         try {
             LanguageCode.setFallbacks(FALLBACKS);
+            if (!mapper.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {
+                ISO_639.setIgnoreNotFound();
+            }
             return mapper.readValue(json, ProductMetadata.class);
         } finally {
             LanguageCode.resetFallBacks();
+            ISO_639.removeIgnoreNotFound();
+
         }
     }