build(deps): bump @fortawesome/react-fontawesome from 0.2.0 to 0.2.1 …

…in /src/main/ui in the fortawesome group (#146) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Geoff Bourne <[email protected]>
zenengeo · May 22, 2024 · db1324f · db1324f
1 parent e9cb2fc
commit db1324f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/me/itzg/cahweb/services/CardsProvider.java b/src/main/java/me/itzg/cahweb/services/CardsProvider.java
@@ -1,5 +1,7 @@
 package me.itzg.cahweb.services;
 
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import me.itzg.cahweb.AppProperties;
 import me.itzg.cahweb.model.BlackCard;
@@ -25,7 +27,11 @@ public CardsProvider(AppProperties appProperties,
         ObjectMapper objectMapper
         ) throws IOException {
         try (InputStream cardsIn = appProperties.cardsJson().getInputStream()) {
-            cardsSource = objectMapper.readValue(cardsIn, CardsSource.class);
+            cardsSource = objectMapper
+                .enable(JsonReadFeature.ALLOW_TRAILING_COMMA.mappedFeature())
+                .readValue(cardsIn, CardsSource.class);
+        } catch (JsonMappingException e) {
+            throw new IllegalStateException("Failed to parse cards json", e);
         }
 
         rand = new Random();

diff --git a/src/main/ui/package-lock.json b/src/main/ui/package-lock.json
diff --git a/src/main/ui/package.json b/src/main/ui/package.json
@@ -6,7 +6,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-regular-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
-    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@fortawesome/react-fontawesome": "^0.2.1",
     "@testing-library/jest-dom": "^6.4.5",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^14.5.2",