You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2024/07/07 16:58:19 UTC
(empire-db) branch master updated: EMPIREDB-431 toLocalDate distinguish runtime type
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new c903d13f EMPIREDB-431 toLocalDate distinguish runtime type
c903d13f is described below
commit c903d13fe321f5927df2f3f16f9aad17c62c90de
Author: Rainer Döbele <rd...@users.noreply.github.com>
AuthorDate: Sun Jul 7 18:58:11 2024 +0200
EMPIREDB-431
toLocalDate distinguish runtime type
---
.../java/org/apache/empire/jakarta/pages/Page.java | 2 +-
.../main/java/org/apache/empire/jsf2/pages/Page.java | 2 +-
.../main/java/org/apache/empire/commons/DateUtils.java | 18 +++++++++++++++---
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
index 41a8c3d1..be275df8 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
@@ -253,7 +253,7 @@ public abstract class Page // *Deprecated* implements Serializable
}
}
- private void logAndHandleActionException(String action, Throwable e)
+ protected void logAndHandleActionException(String action, Throwable e)
{
String msg = "Failed to perform action " + action + " on " + getPageName();
// Message
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
index e3578997..9b09bef7 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
@@ -253,7 +253,7 @@ public abstract class Page // *Deprecated* implements Serializable
}
}
- private void logAndHandleActionException(String action, Throwable e)
+ protected void logAndHandleActionException(String action, Throwable e)
{
String msg = "Failed to perform action " + action + " on " + getPageName();
// Message
diff --git a/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java b/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java
index 2b29857d..c4f8d799 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java
@@ -305,12 +305,24 @@ public class DateUtils
}
public static LocalDate toLocalDate(Date date)
- { // return Instant.ofEpochMilli(date.getTime()).atZone(ZoneId.systemDefault()).toLocalDate();
+ { // Sql Date
+ if (date instanceof java.sql.Date)
+ return toLocalDate((java.sql.Date)date);
+ // Sql Timestamp
+ if (date instanceof java.sql.Timestamp)
+ return toLocalDate((java.sql.Timestamp)date);
+ // other
return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
}
- public static LocalDateTime toLocalDateTime(Date date) {
- // return Instant.ofEpochMilli(date.getTime()).atZone(ZoneId.systemDefault()).toLocalDateTime();
+ public static LocalDateTime toLocalDateTime(Date date)
+ { // Sql Date
+ if (date instanceof java.sql.Date)
+ return toLocalDateTime((java.sql.Date)date);
+ // Sql Timestamp
+ if (date instanceof java.sql.Timestamp)
+ return toLocalDateTime((java.sql.Timestamp)date);
+ // other
return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
}