From 577b98e151e12c363c2c452f00a2f74965cb0cc8 Mon Sep 17 00:00:00 2001 From: Matus Kasak Date: Tue, 18 Aug 2026 15:21:50 +0200 Subject: [PATCH] Ship discofeedResponse.json in main resources so TEST: feed URL works when deployed ClarinDiscoJuiceFeedsDownloadService.openURLConnection() resolves the bundled DiscoJuice feed via getResource("discofeedResponse.json") whenever shibboleth.discofeed.url starts with `TEST:`. That resource only existed under src/test/resources, so it is absent from the packaged server webapp: on a real deployment `TEST:` resolves to null, downloadJSON() catches the resulting IOException, the feed cache stays empty, and GET /api/discojuice/feeds returns 204. The UI DiscoJuice auto-popup then crashes on an undefined feed. Move the fixture into src/main/resources (same classpath location) so it ships in the webapp and TEST: serves a non-empty feed at runtime. It stays on the test classpath too, so ClarinDiscoJuiceFeedsControllerIT is unaffected. Enables no-SP dev instances (e.g. dev-6) to serve a populated feed via local.cfg: shibboleth.discofeed.allowed=true + shibboleth.discofeed.url=TEST: Co-Authored-By: Claude Opus 4.8 --- .../resources/org/dspace/app/rest/discofeedResponse.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dspace-server-webapp/src/{test => main}/resources/org/dspace/app/rest/discofeedResponse.json (100%) diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/discofeedResponse.json b/dspace-server-webapp/src/main/resources/org/dspace/app/rest/discofeedResponse.json similarity index 100% rename from dspace-server-webapp/src/test/resources/org/dspace/app/rest/discofeedResponse.json rename to dspace-server-webapp/src/main/resources/org/dspace/app/rest/discofeedResponse.json