Fixed error message shown when entering the imports page [#2564]

mcpierce · mcpierce · commit 5b5c9f3ef22e · 2026-01-19T10:50:46.000-05:00
diff --git a/comixed-rest/src/main/java/org/comixedproject/rest/comicfiles/ComicFileController.java b/comixed-rest/src/main/java/org/comixedproject/rest/comicfiles/ComicFileController.java
@@ -26,6 +26,7 @@
 import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.log4j.Log4j2;
@@ -75,11 +76,16 @@ public LoadComicFilesResponse loadComicFilesFromSession(final HttpSession sessio
       throws JsonProcessingException {
     log.info("Loading comic files from user session");
     if (session.getAttribute(COMIC_FILES) == null) {
-      return null;
+      return new LoadComicFilesResponse(Collections.emptyList());
+    }
+    List<ComicFileGroup> comicFiles = null;
+    try {
+      comicFiles = this.doLoadComicFileSelections(session);
+    } catch (JsonProcessingException error) {
+      log.error("Failed to parse comic files in session", error);
     }
-    final List<ComicFileGroup> comicFiles = this.doLoadComicFileSelections(session);
     if (Objects.isNull(comicFiles)) {
-      return null;
+      return new LoadComicFilesResponse(Collections.emptyList());
     }
     return new LoadComicFilesResponse(comicFiles);
   }
diff --git a/comixed-rest/src/test/java/org/comixedproject/rest/comicfiles/ComicFileControllerTest.java b/comixed-rest/src/test/java/org/comixedproject/rest/comicfiles/ComicFileControllerTest.java
@@ -110,7 +110,8 @@ void loadComicFilesFromSession_nothingStored() throws JsonProcessingException {
 
     final LoadComicFilesResponse result = controller.loadComicFilesFromSession(session);
 
-    assertNull(result);
+    assertNotNull(result);
+    assertTrue(result.getGroups().isEmpty());
 
     Mockito.verify(session, Mockito.times(1)).getAttribute(COMIC_FILES);
     Mockito.verify(objectMapper, Mockito.never())
@@ -123,20 +124,17 @@ void loadComicFilesFromSession_parsingError() throws JsonProcessingException {
     Mockito.when(objectMapper.readValue(Mockito.anyString(), typeReferenceArgumentCaptor.capture()))
         .thenThrow(JsonProcessingException.class);
 
-    assertThrows(
-        JsonProcessingException.class,
-        () -> {
-          final LoadComicFilesResponse result = controller.loadComicFilesFromSession(session);
+    final LoadComicFilesResponse result = controller.loadComicFilesFromSession(session);
 
-          assertNull(result);
+    assertNotNull(result);
+    assertTrue(result.getGroups().isEmpty());
 
-          final TypeReference<ComicFile> typeReference = typeReferenceArgumentCaptor.getValue();
-          assertNotNull(typeReference);
+    final TypeReference<ComicFile> typeReference = typeReferenceArgumentCaptor.getValue();
+    assertNotNull(typeReference);
 
-          Mockito.verify(session, Mockito.times(1)).getAttribute(COMIC_FILES);
-          Mockito.verify(objectMapper, Mockito.times(1))
-              .readValue(TEST_ENCODED_COMIC_FILES, typeReference);
-        });
+    Mockito.verify(session, Mockito.times(2)).getAttribute(COMIC_FILES);
+    Mockito.verify(objectMapper, Mockito.times(1))
+        .readValue(TEST_ENCODED_COMIC_FILES, typeReference);
   }
 
   @Test
