fix: handle null workspace ID on listConnectionEventsMinimal (#16955)

abuchanan-airbyte · Airbyte Engineering · abuchanan-airbyte · commit 43dd2bd2b844 · 2025-07-10T05:40:19.000-07:00
Co-authored-by: Airbyte Engineering &lt;engineering@airbyte.io&gt;
diff --git a/airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/ConnectionsHandler.java b/airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/ConnectionsHandler.java
@@ -1540,6 +1540,10 @@ public void backfillConnectionEvents(final ConnectionEventsBackfillRequestBody c
   }
 
   public ConnectionEventListMinimal listConnectionEventsMinimal(ConnectionEventsListMinimalRequestBody requestBody) throws IOException {
+    if (requestBody.getWorkspaceId() == null) {
+      return new ConnectionEventListMinimal();
+    }
+
     // Get all connection IDs for the workspace using the lightweight method
     final List<UUID> connectionIds = connectionService.listConnectionIdsForWorkspace(requestBody.getWorkspaceId());
 

Original file line number	Diff line number	Diff line change
`@@ -1540,6 +1540,10 @@ public void backfillConnectionEvents(final ConnectionEventsBackfillRequestBody c`
`1540`	`1540`	`}`
`1541`	`1541`
`1542`	`1542`	`public ConnectionEventListMinimal listConnectionEventsMinimal(ConnectionEventsListMinimalRequestBody requestBody) throws IOException {`
	`1543`	`+ if (requestBody.getWorkspaceId() == null) {`
	`1544`	`+ return new ConnectionEventListMinimal();`
	`1545`	`+ }`
	`1546`	`+`
`1543`	`1547`	`// Get all connection IDs for the workspace using the lightweight method`
`1544`	`1548`	`final List<UUID> connectionIds = connectionService.listConnectionIdsForWorkspace(requestBody.getWorkspaceId());`
`1545`	`1549`