From 98d1f1890d7a87439b7db126149e92662e0c949f Mon Sep 17 00:00:00 2001
From: Thomasr <techninjas514@begintrust.com>
Date: Fri, 29 Nov 2024 04:09:53 -0500
Subject: [PATCH] Fixed null pointer exception when there is streamApi query
 library type in database

---
 .../org/lowcoder/api/query/LibraryQueryApiServiceImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java
index 572f7ccdd..69c5c3f8f 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java
@@ -87,7 +87,10 @@ private Flux<LibraryQuery> getByOrgIdWithDatasourcePermissions(String orgId) {
         Flux<LibraryQuery> libraryQueryFlux = libraryQueryService.getByOrganizationId(orgId)
                 .cache();
 
-        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> libraryQuery.getQuery().getDatasourceId())
+        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> {
+                    var datasourceId = libraryQuery.getQuery().getDatasourceId();
+                    return Objects.requireNonNullElse(datasourceId, "");
+                })
                 .filter(StringUtils::isNotBlank)
                 .collectList()
                 .cache();