Skip to content

fix(java): emit @JsonFormat for optional date/time properties #3049

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

Merged
schani merged 2 commits into from
Jul 21, 2026
Merged

fix(java): emit @JsonFormat for optional date/time properties #3049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b965a8
fix(java): emit @JsonFormat for optional date/time properties (#1593)
schani Jul 20, 2026
50685d0
test: add missing fixture cases for optional-date-time.schema (#3049)
schani Jul 20, 2026
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
12 changes: 10 additions & 2 deletions packages/quicktype-core/src/language/Java/JavaJacksonRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import {
type TypeKind,
UnionType,
} from "../../Type/index.js";
import { removeNullFromUnion } from "../../Type/TypeUtils.js";
import {
nullableFromUnion,
removeNullFromUnion,
} from "../../Type/TypeUtils.js";

import { JavaRenderer } from "./JavaRenderer.js";
import { stringEscape } from "./utils.js";
Expand Down Expand Up @@ -58,7 +61,12 @@ export class JacksonRenderer extends JavaRenderer {
`@JsonProperty("${stringEscape(jsonName)}")`,
];

switch (p.type.kind) {
const propertyType =
p.type instanceof UnionType
? (nullableFromUnion(p.type) ?? p.type)
: p.type;

switch (propertyType.kind) {
case "date-time":
this._dateTimeProvider.dateTimeJacksonAnnotations.forEach(
(annotation) => {
Expand Down
8 changes: 8 additions & 0 deletions test/inputs/schema/optional-date-time.1.fail.date-time.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"required-date": "2024-01-02",
"required-time": "12:34:56Z",
"required-date-time": "not a valid date-time at all",
"optional-date": "2024-01-02",
"optional-time": "12:34:56Z",
"optional-date-time": "2024-01-02T12:34:56Z"
}
8 changes: 8 additions & 0 deletions test/inputs/schema/optional-date-time.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"required-date": "2024-01-02",
"required-time": "12:34:56Z",
"required-date-time": "2024-01-02T12:34:56Z",
"optional-date": "2024-01-02",
"optional-time": "12:34:56Z",
"optional-date-time": "2024-01-02T12:34:56Z"
}
35 changes: 35 additions & 0 deletions test/inputs/schema/optional-date-time.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"type": "object",
"additionalProperties": false,
"properties": {
"required-date": {
"type": "string",
"format": "date"
},
"required-time": {
"type": "string",
"format": "time"
},
"required-date-time": {
"type": "string",
"format": "date-time"
},
"optional-date": {
"type": "string",
"format": "date"
},
"optional-time": {
"type": "string",
"format": "time"
},
"optional-date-time": {
"type": "string",
"format": "date-time"
}
},
"required": [
"required-date",
"required-time",
"required-date-time"
]
}
Loading