diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java index b8999aee62f..86d09478f06 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java @@ -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; @@ -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); } diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/CBModelConstants.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/CBModelConstants.java index bbe2ab80967..7cc270e12be 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/CBModelConstants.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/CBModelConstants.java @@ -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); } diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java index 8fe043ddc06..3c8c628e559 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java @@ -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; @@ -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