Merge pull request #1475 from lowcoder-org/fix/null_settings_value

FalkWolsky · web-flow · commit ae595bc5c0bb · 2025-01-30T17:06:09.000+01:00
Fix issues when application settings has null values for category, description, icon and title
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -172,9 +172,9 @@ public Mono<String> getCategory(ApplicationRecordService applicationRecordServic
             if (liveDSL == null || liveDSL.get("settings") == null) return "";
             Object settingsObject = liveDSL.get("settings");
             if (settingsObject instanceof Map) {
-                @SuppressWarnings("unchecked")
-                Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
-                return (String) settings.get("category");
+                Map<?, ?> settings = (Map<?, ?>) liveDSL.get("settings");
+                Object category = settings.get("category");
+                return (category != null & category instanceof String)?(String) category:"";
             } else {
                 return "";
             }
@@ -186,9 +186,9 @@ public Mono<String> getTitle(ApplicationRecordService applicationRecordService)
             if (liveDSL == null || liveDSL.get("settings") == null) return "";
             Object settingsObject = liveDSL.get("settings");
             if (settingsObject instanceof Map) {
-                @SuppressWarnings("unchecked")
-                Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
-                return (String) settings.get("title");
+                Map<?, ?> settings = (Map<?, ?>) liveDSL.get("settings");
+                Object title = settings.get("title");
+                return (title != null & title instanceof String)?(String) title:"";
             } else {
                 return "";
             }
@@ -200,9 +200,9 @@ public Mono<String> getDescription(ApplicationRecordService applicationRecordSer
                 if (liveDSL == null || liveDSL.get("settings") == null) return "";
                 Object settingsObject = liveDSL.get("settings");
                 if (settingsObject instanceof Map) {
-                    @SuppressWarnings("unchecked")
-                    Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
-                    return (String) settings.get("description");
+                    Map<?, ?> settings = (Map<?, ?>) liveDSL.get("settings");
+                    Object description = settings.get("description");
+                    return (description != null & description instanceof String)?(String) description:"";
                 } else {
                     return "";
                 }
@@ -215,9 +215,9 @@ public Mono<String> getIcon(ApplicationRecordService applicationRecordService) {
                     if (liveDSL == null || liveDSL.get("settings") == null) return "";
                     Object settingsObject = liveDSL.get("settings");
                     if (settingsObject instanceof Map) {
-                        @SuppressWarnings("unchecked")
-                        Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
-                        return (String) settings.get("icon");
+                        Map<?, ?> settings = (Map<?, ?>) liveDSL.get("settings");
+                        Object icon = settings.get("icon");
+                        return (icon != null & icon instanceof String)?(String) icon:"";
                     } else {
                         return "";
                     }
