Skip to content

dbeaver/pro#5476 Move ZONE_ID_UTC to StandardConstants #3836

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
ShadelessFox wants to merge 5 commits into
base: devel
Choose a base branch
from
Open

dbeaver/pro#5476 Move ZONE_ID_UTC to StandardConstants #3836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36be366
dbeaver/pro#5476 Move `ZONE_ID_UTC` to `StandardConstants`
ShadelessFox Oct 16, 2025
e64d5ff
Merge branch 'devel' into dbeaver/pro#5476-task-scheduler-refactor
MashaKorax Oct 21, 2025
d810edf
Merge branch 'devel' of https://github.com/dbeaver/cloudbeaver into d…
ShadelessFox Oct 23, 2025
2a3a946
Merge branch 'devel' into dbeaver/pro#5476-task-scheduler-refactor
kseniaguzeeva Oct 24, 2025
c814017
Merge branch 'devel' into dbeaver/pro#5476-task-scheduler-refactor
kseniaguzeeva Oct 27, 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
8 changes: 5 additions & 3 deletions ...ndles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.IOUtils;
import org.jkiss.utils.Pair;
import org.jkiss.utils.StandardConstants;

import java.io.IOException;
import java.nio.file.*;
import java.text.MessageFormat;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.function.Supplier;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -1262,8 +1262,10 @@ private static RMProject createRmProjectFromWebProject(Path path, RMLocalProject
project.setProjectPermissions(allProjectPermissions);
if (Files.exists(path)) {
try {
project.setCreateTime(
OffsetDateTime.ofInstant(Files.getLastModifiedTime(path).toInstant(), ZoneId.of("UTC")).toInstant().toEpochMilli());
project.setCreateTime(OffsetDateTime.ofInstant(
Files.getLastModifiedTime(path).toInstant(),
StandardConstants.ZONE_ID_UTC
).toInstant().toEpochMilli());
} catch (IOException e) {
log.error(e);
}
Expand Down
4 changes: 2 additions & 2 deletions server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/CBModelConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
package io.cloudbeaver.utils;

import org.jkiss.dbeaver.model.DBConstants;
import org.jkiss.utils.StandardConstants;

import java.time.ZoneId;
import java.time.format.DateTimeFormatter;

public class CBModelConstants {
public static final DateTimeFormatter ISO_DATE_FORMAT = DateTimeFormatter.ofPattern(DBConstants.DEFAULT_ISO_TIMESTAMP_FORMAT)
.withZone(ZoneId.of("UTC"));
.withZone(StandardConstants.ZONE_ID_UTC);
}
4 changes: 2 additions & 2 deletions server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
import org.jkiss.dbeaver.model.websocket.event.WSTransactionalCountEvent;
import org.jkiss.dbeaver.utils.RuntimeUtils;
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.StandardConstants;

import java.lang.reflect.InvocationTargetException;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -74,7 +74,7 @@ public class WebSQLContextInfo implements WebSessionProvider {
private final AtomicInteger resultId = new AtomicInteger();

public static final DateTimeFormatter ISO_DATE_FORMAT = DateTimeFormatter.ofPattern(DBConstants.DEFAULT_ISO_TIMESTAMP_FORMAT)
.withZone(ZoneId.of("UTC"));
.withZone(StandardConstants.ZONE_ID_UTC);

public WebSQLContextInfo(
WebSQLProcessor processor, String id, String catalogName, String schemaName, String projectId
Expand Down
Loading