Skip to content

Fix for WARNING in Java 25: Use of the three-letter time zone ID ... is deprecated and it will be removed in a future release #15432

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
codeconsole merged 14 commits into from
May 2, 2026
Merged

Fix for WARNING in Java 25: Use of the three-letter time zone ID ... is deprecated and it will be removed in a future release #15432

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2fcf832
Fix for WARNING: Use of the three-letter time zone ID ... is deprecat…
codeconsole Feb 21, 2026
ba0835b
fix formatting
codeconsole Feb 21, 2026
6c3e9b1
Merge branch '7.0.x' into time-zone-warning-fix
jamesfredley Feb 24, 2026
5f368fe
test: add Spock specs for Date and Calendar marshallers
jamesfredley Feb 27, 2026
66ed763
Merge branch '7.0.x' into time-zone-warning-fix
jamesfredley Feb 27, 2026
95dc9c2
test: add functional tests for Date/Calendar marshalling in app1
jamesfredley Feb 27, 2026
e4b640a
Merge branch '7.0.x' into time-zone-warning-fix
jamesfredley Feb 27, 2026
d3c8279
JDK ISO formatters with chained constructors
codeconsole Apr 29, 2026
9775744
fix codestyle
codeconsole Apr 29, 2026
c755b16
Merge branch '8.0.x' into time-zone-warning-fix
codeconsole Apr 29, 2026
40888f3
switch to HttpClientSupport
codeconsole Apr 30, 2026
0d140fe
fix tests
codeconsole Apr 30, 2026
76b1c9c
Merge branch '8.0.x' into time-zone-warning-fix
codeconsole May 1, 2026
81c363b
test: simplify date-marshaling tests
matrei May 2, 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
20 changes: 13 additions & 7 deletions ...verters/src/main/groovy/org/grails/web/converters/marshaller/json/CalendarMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
package org.grails.web.converters.marshaller.json;

import java.text.Format;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Locale;
import java.util.TimeZone;

import org.apache.commons.lang3.time.FastDateFormat;

import grails.converters.JSON;
import org.grails.web.converters.exceptions.ConverterException;
Expand All @@ -37,21 +36,25 @@
*/
public class CalendarMarshaller implements ObjectMarshaller<JSON> {

private final Format formatter;
private static final DateTimeFormatter DEFAULT_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
.withZone(ZoneOffset.UTC);

private final Format legacyFormatter;

/**
* Constructor with a custom formatter.
* @param formatter the formatter
*/
public CalendarMarshaller(Format formatter) {
this.formatter = formatter;
this.legacyFormatter = formatter;
}

/**
* Default constructor.
*/
public CalendarMarshaller() {
this(FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", TimeZone.getTimeZone("GMT"), Locale.US));
this.legacyFormatter = null;
Comment thread
codeconsole marked this conversation as resolved.
Outdated
Comment thread
codeconsole marked this conversation as resolved.
Outdated
}

public boolean supports(Object object) {
Expand All @@ -61,7 +64,10 @@ public boolean supports(Object object) {
public void marshalObject(Object object, JSON converter) throws ConverterException {
try {
Calendar calendar = (Calendar) object;
converter.getWriter().value(formatter.format(calendar.getTime()));
String formatted = legacyFormatter != null ?
legacyFormatter.format(calendar.getTime()) :
DEFAULT_FORMATTER.format(calendar.toInstant());
converter.getWriter().value(formatted);
}
catch (JSONException e) {
throw new ConverterException(e);
Expand Down
21 changes: 14 additions & 7 deletions ...-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DateMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
package org.grails.web.converters.marshaller.json;

import java.text.Format;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;

import org.apache.commons.lang3.time.FastDateFormat;

import grails.converters.JSON;
import org.grails.web.converters.exceptions.ConverterException;
Expand All @@ -39,21 +38,25 @@
*/
public class DateMarshaller implements ObjectMarshaller<JSON> {

private final Format formatter;
private static final DateTimeFormatter DEFAULT_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
.withZone(ZoneOffset.UTC);

private final Format legacyFormatter;

/**
* Constructor with a custom formatter.
* @param formatter the formatter
*/
public DateMarshaller(Format formatter) {
this.formatter = formatter;
this.legacyFormatter = formatter;
}

/**
* Default constructor.
*/
public DateMarshaller() {
this(FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", TimeZone.getTimeZone("GMT"), Locale.US));
this.legacyFormatter = null;
Comment thread
codeconsole marked this conversation as resolved.
Outdated
}

public boolean supports(Object object) {
Expand All @@ -62,7 +65,11 @@ public boolean supports(Object object) {

public void marshalObject(Object object, JSON converter) throws ConverterException {
try {
converter.getWriter().value(formatter.format(object));
Date date = (Date) object;
String formatted = legacyFormatter != null ?
legacyFormatter.format(date) :
DEFAULT_FORMATTER.format(date.toInstant());
converter.getWriter().value(formatted);
}
catch (JSONException e) {
throw new ConverterException(e);
Expand Down
20 changes: 14 additions & 6 deletions ...s-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DateMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
package org.grails.web.converters.marshaller.xml;

import java.text.Format;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;

import org.apache.commons.lang3.time.FastDateFormat;

import grails.converters.XML;
import org.grails.web.converters.ConverterUtil;
import org.grails.web.converters.exceptions.ConverterException;
Expand All @@ -34,21 +34,25 @@
*/
public class DateMarshaller implements ObjectMarshaller<XML> {

private final Format formatter;
private static final DateTimeFormatter DEFAULT_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS z")
Comment thread
codeconsole marked this conversation as resolved.
Outdated
.withZone(ZoneId.systemDefault());

private final Format legacyFormatter;

/**
* Constructor with a custom formatter.
* @param formatter the formatter
*/
public DateMarshaller(Format formatter) {
this.formatter = formatter;
this.legacyFormatter = formatter;
}

/**
* Default constructor.
*/
public DateMarshaller() {
this(FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss.S z"));
this.legacyFormatter = null;
Comment thread
codeconsole marked this conversation as resolved.
Outdated
}

public boolean supports(Object object) {
Expand All @@ -57,7 +61,11 @@ public boolean supports(Object object) {

public void marshalObject(Object object, XML xml) throws ConverterException {
try {
xml.chars(formatter.format(object));
Date date = (Date) object;
String formatted = legacyFormatter != null ?
legacyFormatter.format(date) :
DEFAULT_FORMATTER.format(date.toInstant());
xml.chars(formatted);
}
catch (Exception e) {
throw ConverterUtil.resolveConverterException(e);
Expand Down
Loading