Skip to content

Conversation

@mawaelzl
Copy link
Contributor

@mawaelzl mawaelzl commented Feb 6, 2026

Description

Fixes NullPointerException when serializing null Instant values
Issue: #765

The solution

null check before calling instant.toString()

Summary by Sourcery

Handle null Instant values during JSON serialization and cover the behavior with a regression test.

Bug Fixes:

  • Prevent NullPointerException when serializing null Instant values to JSON.

Tests:

  • Add a regression test and approved JSON file to verify serialization of null Instant values.

@sourcery-ai
Copy link

sourcery-ai bot commented Feb 6, 2026

Reviewer's Guide

Adds null-safe JSON serialization for java.time.Instant values and introduces a regression test to cover null Instant handling in JsonApprovals.

Class diagram for updated InstantAdapter JSON serialization

classDiagram
  class TypeAdapter_Instant

  class InstantAdapter {
    +write(JsonWriter jsonWriter, Instant instant) void
  }

  class JsonWriter
  class Instant

  TypeAdapter_Instant <|-- InstantAdapter
  InstantAdapter ..> JsonWriter
  InstantAdapter ..> Instant
Loading

Flow diagram for InstantAdapter.write null-safe logic

flowchart TD
  A["start write(JsonWriter jsonWriter, Instant instant)"] --> B{"instant is null"}
  B -->|yes| C["jsonWriter.nullValue"]
  B -->|no| D["jsonWriter.value(concatenate_empty_string_with_instant)"]
  C --> E["end"]
  D --> E["end"]
Loading

File-Level Changes

Change Details Files
Make Instant JSON serialization null-safe in JsonUtils.InstantAdapter to avoid NullPointerException.
  • Update write() to check for null Instant before serialization
  • Write JsonWriter.nullValue() when the Instant is null
  • Serialize non-null Instants via jsonWriter.value("" + instant) instead of instant.toString()
approvaltests-util/src/main/java/com/spun/util/JsonUtils.java
Add regression test ensuring JsonApprovals can serialize objects with null Instant properties.
  • Import java.time.Instant in JsonApprovalsTest
  • Introduce InstantWrapper test helper with nullable Instant field and getter/setter
  • Add nullInstantTest that verifies JSON output for InstantWrapper using JsonApprovals.verifyAsJson with serializeNulls()
  • Add approved JSON file for nullInstantTest to capture expected serialized form
approvaltests-tests/src/test/java/org/approvaltests/JsonApprovalsTest.java
approvaltests-tests/src/test/java/org/approvaltests/JsonApprovalsTest.nullInstantTest.approved.json

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've left some high level feedback:

  • In InstantAdapter.write, you can keep using instant.toString() and just guard it with the null check rather than switching to "" + instant, which is less explicit about intent.
  • Consider making InstantWrapper a static nested class in JsonApprovalsTest since it doesn’t access any instance state from the outer class and this avoids an unnecessary reference to the test instance.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In `InstantAdapter.write`, you can keep using `instant.toString()` and just guard it with the null check rather than switching to `"" + instant`, which is less explicit about intent.
- Consider making `InstantWrapper` a `static` nested class in `JsonApprovalsTest` since it doesn’t access any instance state from the outer class and this avoids an unnecessary reference to the test instance.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@LarsEckart LarsEckart merged commit fec3986 into approvals:master Feb 6, 2026
15 checks passed
@LarsEckart
Copy link
Contributor

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants