Skip to content

Fix NPE when Vertex AI listSessions omits sessions #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rolandkakonyi wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −4
Open

Fix NPE when Vertex AI listSessions omits sessions #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,17 @@ public Single<ListSessionsResponse> listSessions(String appName, String userId)
.map(
listSessionsResponseMap ->
parseListSessionsResponse(listSessionsResponseMap, appName, userId))
.defaultIfEmpty(ListSessionsResponse.builder().build());
.defaultIfEmpty(ListSessionsResponse.builder().sessions(new ArrayList<>()).build());
Copy link
Contributor

@sherryfox sherryfox Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The builder() already initializes the session with an empty list so we can probably skip this here and in line 138.

}

private ListSessionsResponse parseListSessionsResponse(
JsonNode listSessionsResponseMap, String appName, String userId) {
JsonNode sessionsNode = listSessionsResponseMap.get("sessions");
if (sessionsNode == null || sessionsNode.isNull() || sessionsNode.isEmpty()) {
return ListSessionsResponse.builder().sessions(new ArrayList<>()).build();
}
List<Map<String, Object>> apiSessions =
objectMapper.convertValue(
listSessionsResponseMap.get("sessions"),
new TypeReference<List<Map<String, Object>>>() {});
objectMapper.convertValue(sessionsNode, new TypeReference<List<Map<String, Object>>>() {});

List<Session> sessions = new ArrayList<>();
for (Map<String, Object> apiSession : apiSessions) {
Expand Down
34 changes: 34 additions & 0 deletions core/src/test/java/com/google/adk/sessions/VertexAiSessionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import okhttp3.MediaType;
import okhttp3.ResponseBody;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -37,6 +39,20 @@
public class VertexAiSessionServiceTest {

private static final ObjectMapper mapper = JsonBaseModel.getMapper();
private static final MediaType JSON_MEDIA_TYPE =
MediaType.parse("application/json; charset=utf-8");

private static ApiResponse apiResponseJson(String json) {
return new ApiResponse() {
@Override
public ResponseBody getResponseBody() {
return ResponseBody.create(JSON_MEDIA_TYPE, json);
}

@Override
public void close() {}
};
}

private static final String MOCK_SESSION_STRING_1 =
"""
Expand Down Expand Up @@ -319,6 +335,24 @@ public void listSessions_empty() {
.isEmpty();
}

@Test
public void listSessions_missingSessionsField_returnsEmpty() {
when(mockApiClient.request("GET", "reasoningEngines/123/sessions?filter=user_id=userX", ""))
.thenReturn(apiResponseJson("{}"));

assertThat(vertexAiSessionService.listSessions("123", "userX").blockingGet().sessions())
.isEmpty();
}

@Test
public void listSessions_nullSessionsField_returnsEmpty() {
when(mockApiClient.request("GET", "reasoningEngines/123/sessions?filter=user_id=userY", ""))
.thenReturn(apiResponseJson("{\"sessions\": null}"));
Copy link
Contributor

@sherryfox sherryfox Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WDYT about updating this to something like:
.thenAnswer(new MockApiAnswer(...)) and adjusting MockApiAnswer implementation to respond with given rawApiResponse?

This way we could avoid importing a new lib (and using a non-trivial, realistic media type to mock ApiResponse) for the purpose of those tests


assertThat(vertexAiSessionService.listSessions("123", "userY").blockingGet().sessions())
.isEmpty();
}

@Test
public void listEvents_empty() {
assertThat(vertexAiSessionService.listEvents("789", "user1", "3").blockingGet().events())
Expand Down
Loading