Skip to content

fix: handle null AiMessage.text() in LangChain4j.toParts() #1035

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
anandnair2005 wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −0
Open

fix: handle null AiMessage.text() in LangChain4j.toParts() #1035

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
3 changes: 3 additions & 0 deletions contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,9 @@ private List<Part> toParts(AiMessage aiMessage) {
});
return parts;
} else {
if (aiMessage.text() == null) {
return List.of();
}
Part part = Part.builder().text(aiMessage.text()).build();
return List.of(part);
Comment on lines +527 to 531
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 14, 2026

Choose a reason for hiding this comment

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

medium

While the logic is correct, this block can be made slightly more efficient and readable by avoiding the repeated call to aiMessage.text(). Storing the result in a local variable first makes the code cleaner and more concise.

Suggested change
if (aiMessage.text() == null) {
return List.of();
}
Part part = Part.builder().text(aiMessage.text()).build();
return List.of(part);
String text = aiMessage.text();
if (text == null) {
return List.of();
}
return List.of(Part.builder().text(text).build());

}
Expand Down
24 changes: 24 additions & 0 deletions contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,4 +688,28 @@ void testGenerateContentWithStructuredResponseJsonSchema() {
final UserMessage userMessage = (UserMessage) capturedRequest.messages().get(0);
assertThat(userMessage.singleText()).isEqualTo("Give me information about John Doe");
}

@Test
@DisplayName("Should handle null AiMessage text without throwing NPE")
void testGenerateContentWithNullAiMessageText() {
// Given
final LlmRequest llmRequest =
LlmRequest.builder().contents(List.of(Content.fromParts(Part.fromText("Hello")))).build();

final ChatResponse chatResponse = mock(ChatResponse.class);
final AiMessage aiMessage = mock(AiMessage.class);
when(aiMessage.text()).thenReturn(null);
when(aiMessage.hasToolExecutionRequests()).thenReturn(false);
when(chatResponse.aiMessage()).thenReturn(aiMessage);
when(chatModel.chat(any(ChatRequest.class))).thenReturn(chatResponse);

// When
final Flowable<LlmResponse> responseFlowable = langChain4j.generateContent(llmRequest, false);
final LlmResponse response = responseFlowable.blockingFirst();

// Then - no NPE thrown, and content has no text parts
assertThat(response).isNotNull();
assertThat(response.content()).isPresent();
assertThat(response.content().get().parts().orElse(List.of())).isEmpty();
}
}