fix: handle proprety being null

cleydyr · May 26, 2024 · 6add0f8 · 6add0f8
1 parent 0dde8ba
commit 6add0f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/biblivre/core/properties/MenuPropertiesService.java b/src/main/java/biblivre/core/properties/MenuPropertiesService.java
@@ -12,4 +12,12 @@
 @Setter
 public class MenuPropertiesService {
     private Collection<String> disabled;
+
+    public boolean isEnabled(String item) {
+        if (disabled == null) {
+            return true;
+        }
+
+        return !disabled.contains(item);
+    }
 }
diff --git a/src/main/java/biblivre/login/MenuProviderImpl.java b/src/main/java/biblivre/login/MenuProviderImpl.java
@@ -44,9 +44,7 @@ public Map<String, List<String>> getAllowedModules(Predicate<String> filter) {
                                         String item = obj.toString();
 
                                         if (filter.test(item)
-                                                && !menuPropertiesService
-                                                        .getDisabled()
-                                                        .contains(item)) {
+                                                && menuPropertiesService.isEnabled(item)) {
                                             allowedModules
                                                     .computeIfAbsent(name, __ -> new ArrayList<>())
                                                     .add(item);

diff --git a/src/main/java/biblivre/menu/Handler.java b/src/main/java/biblivre/menu/Handler.java
@@ -302,11 +302,13 @@ public void administrationReports(ExtendedRequest request, ExtendedResponse resp
     }
 
     public void administrationCustomReports(ExtendedRequest request, ExtendedResponse response) {
-        if (menuPropertiesService.getDisabled().contains("administration_custom_reports")) {
-            throw new IllegalArgumentException("Custom reports are not enabled.");
+        if (menuPropertiesService.isEnabled("administration_custom_reports")) {
+            setJspURL("/WEB-INF/jsp/administration/custom_reports.jsp");
+
+            return;
         }
 
-        setJspURL("/WEB-INF/jsp/administration/custom_reports.jsp");
+        throw new IllegalArgumentException("Custom reports are not enabled.");
     }
 
     public void administrationUserTypes(ExtendedRequest request, ExtendedResponse response) {