diff --git a/modules/org.jkiss.utils/src/org/jkiss/utils/GsonUtils.java b/modules/org.jkiss.utils/src/org/jkiss/utils/GsonUtils.java index c0bb5446..323e97c8 100644 --- a/modules/org.jkiss.utils/src/org/jkiss/utils/GsonUtils.java +++ b/modules/org.jkiss.utils/src/org/jkiss/utils/GsonUtils.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2024 DBeaver Corp and others + * Copyright (C) 2010-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,10 @@ import com.google.gson.*; import java.lang.reflect.Type; -import java.time.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalQueries; @@ -31,7 +34,7 @@ public class GsonUtils { private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter .ofPattern("MMM d, yyyy[, h:mm:ss a]") .localizedBy(Locale.ENGLISH) - .withZone(ZoneId.of("UTC")); + .withZone(StandardConstants.ZONE_ID_UTC); public static GsonBuilder gsonBuilder() { return new GsonBuilder() @@ -55,7 +58,7 @@ public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContex public static class DateTypeAdapter implements JsonSerializer, JsonDeserializer { @Override public synchronized JsonElement serialize(Date date, Type type, JsonSerializationContext jsonSerializationContext) { - return new JsonPrimitive(LocalDateTime.ofInstant(date.toInstant(), ZoneId.of("UTC")).format(DATE_TIME_FORMATTER)); + return new JsonPrimitive(LocalDateTime.ofInstant(date.toInstant(), StandardConstants.ZONE_ID_UTC).format(DATE_TIME_FORMATTER)); } @Override diff --git a/modules/org.jkiss.utils/src/org/jkiss/utils/StandardConstants.java b/modules/org.jkiss.utils/src/org/jkiss/utils/StandardConstants.java index 1f4dce23..675b60f7 100644 --- a/modules/org.jkiss.utils/src/org/jkiss/utils/StandardConstants.java +++ b/modules/org.jkiss.utils/src/org/jkiss/utils/StandardConstants.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2024 DBeaver Corp and others + * Copyright (C) 2010-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ */ package org.jkiss.utils; +import java.time.ZoneId; + /** * Standard Java constants */ @@ -46,4 +48,6 @@ public abstract class StandardConstants { public static final String ISO_DATE_PATTERN = "yyyy-MM-dd"; public static final String ISO_TIME_PATTERN = "HH:mm:ss'Z'"; public static final String ISO_TIMESTAMP_PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'"; + + public static final ZoneId ZONE_ID_UTC = ZoneId.of("UTC"); }