You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/11/27 05:59:36 UTC
[syncope] 01/02: Upgrading db and jdbc versions
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 448b053646af39c0b17e85f9c8745aa0d82d503d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sat Nov 27 06:59:11 2021 +0100
Upgrading db and jdbc versions
---
.../syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 9 +++++++--
.../apache/syncope/core/persistence/jpa/dao/AbstractDAO.java | 7 +++++++
pom.xml | 10 +++++-----
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 8da2119..311da1d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa.dao;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -143,8 +144,12 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
Date creationDate = null;
Date lastChangeDate = null;
if (!result.isEmpty()) {
- creationDate = (Date) result.get(0)[0];
- lastChangeDate = (Date) result.get(0)[1];
+ creationDate = result.get(0)[0] instanceof LocalDateTime
+ ? convert((LocalDateTime) result.get(0)[0])
+ : (Date) result.get(0)[0];
+ lastChangeDate = result.get(0)[1] instanceof LocalDateTime
+ ? convert((LocalDateTime) result.get(0)[1])
+ : (Date) result.get(0)[1];
}
return lastChangeDate == null ? creationDate : lastChangeDate;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
index fd87b30..a8aceeb 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
@@ -18,6 +18,9 @@
*/
package org.apache.syncope.core.persistence.jpa.dao;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
import javax.persistence.EntityManager;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.core.spring.ApplicationContextProvider;
@@ -33,6 +36,10 @@ public abstract class AbstractDAO<E extends Entity> implements DAO<E> {
protected static final Logger LOG = LoggerFactory.getLogger(DAO.class);
+ protected Date convert(final LocalDateTime localDateTime) {
+ return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ }
+
protected EntityManager entityManager() {
EntityManager entityManager = EntityManagerFactoryUtils.getTransactionalEntityManager(
EntityManagerFactoryUtils.findEntityManagerFactory(
diff --git a/pom.xml b/pom.xml
index 184a538..7080d8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,12 +539,12 @@ under the License.
<docker.postgresql.version>12</docker.postgresql.version>
<docker.mysql.version>8.0</docker.mysql.version>
- <docker.mariadb.version>10.6</docker.mariadb.version>
+ <docker.mariadb.version>10</docker.mariadb.version>
- <jdbc.postgresql.version>42.2.22</jdbc.postgresql.version>
- <jdbc.mysql.version>8.0.22</jdbc.mysql.version>
- <jdbc.mariadb.version>2.7.3</jdbc.mariadb.version>
- <jdbc.mssql.version>9.2.1.jre</jdbc.mssql.version>
+ <jdbc.postgresql.version>42.3.1</jdbc.postgresql.version>
+ <jdbc.mysql.version>8.0.27</jdbc.mysql.version>
+ <jdbc.mariadb.version>2.7.4</jdbc.mariadb.version>
+ <jdbc.mssql.version>9.4.0.jre</jdbc.mssql.version>
<adminUser>admin</adminUser>
<anonymousUser>anonymous</anonymousUser>