Skip to content

Fix java.sql.Timestamp serialization #688

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
g-tom wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix java.sql.Timestamp serialization #688

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
03d024c
Add some tests of timestamp serialization
g-tom Nov 10, 2025
0931470
Fix serializing java.sql.Timestamp
g-tom Nov 10, 2025
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
43 changes: 0 additions & 43 deletions src/main/java/org/eclipse/yasson/internal/serializer/types/SqlTimestampSerializer.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/org/eclipse/yasson/internal/serializer/types/TypeSerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public class TypeSerializers {
if (isClassAvailable("java.sql.Date")) {
cache.put(Date.class, SqlDateSerializer::new);
cache.put(java.sql.Date.class, SqlDateSerializer::new);
cache.put(java.sql.Timestamp.class, SqlTimestampSerializer::new);
cache.put(java.sql.Timestamp.class, SqlDateSerializer::new);
}
SERIALIZERS = Map.copyOf(cache);

Expand Down
59 changes: 59 additions & 0 deletions src/test/java/org/eclipse/yasson/serializers/TimeSerializersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0,
* or the Eclipse Distribution License v. 1.0 which is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/

package org.eclipse.yasson.serializers;

import static org.eclipse.yasson.Jsonbs.defaultJsonb;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.sql.Timestamp;
import java.util.Date;

import org.junit.jupiter.api.Test;

import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;

public class TimeSerializersTest {

private static final String EPOCH_DEFAULT = "\"1970-01-01T00:00:00Z[UTC]\"";
private static final String EPOCH_CUSTOM = "\"1970-01-01T00:00:00.000Z\"";

private static final Jsonb JSONB_CUSTOM = JsonbBuilder.create(
new JsonbConfig().withDateFormat(
"yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'SSSXXX", null));

@Test
public void serializeDateDefault() {
Date date = new Date(0l);
assertEquals(EPOCH_DEFAULT, defaultJsonb.toJson(date));
}

@Test
public void serializeSqlTimestampDefault() {
Timestamp ts = new Timestamp(0l);
assertEquals(EPOCH_DEFAULT, defaultJsonb.toJson(ts));
}

@Test
public void serializeDateCustom() {
Date date = new Date(0l);
assertEquals(EPOCH_CUSTOM, JSONB_CUSTOM.toJson(date));
}

@Test
public void serializeSqlTimestampCustom() {
Timestamp ts = new Timestamp(0l);
assertEquals(EPOCH_CUSTOM, JSONB_CUSTOM.toJson(ts));
}
}