From 8541c0ae28c38a1ed2bf28f54adfa595214cda36 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Sat, 30 May 2020 19:17:55 +0300
Subject: [PATCH] optimized imports and final touch-ups
---
datastore/src/main/java/net/jami/datastore/dao/ContactDao.java | 2 +-
datastore/src/main/java/net/jami/datastore/dao/DeviceDao.java | 2 +-
datastore/src/main/java/net/jami/datastore/dao/SystemDao.java | 2 +-
datastore/src/main/java/net/jami/datastore/dao/UserDao.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/datastore/src/main/java/net/jami/datastore/dao/ContactDao.java b/datastore/src/main/java/net/jami/datastore/dao/ContactDao.java
index 8d97878e..729ba671 100644
--- a/datastore/src/main/java/net/jami/datastore/dao/ContactDao.java
+++ b/datastore/src/main/java/net/jami/datastore/dao/ContactDao.java
@@ -63,7 +63,7 @@ public class ContactDao extends AbstractDao<Contact> {
"VALUES " +
"(?, ?, ?)");
ps = object.getInsert(ps);
- return ps.execute();
+ return ps.executeUpdate() != 0;
}
catch (Exception e){
log.error("An error has occurred while trying to store a user: " + e.toString());
diff --git a/datastore/src/main/java/net/jami/datastore/dao/DeviceDao.java b/datastore/src/main/java/net/jami/datastore/dao/DeviceDao.java
index 2c5f8978..bf3ab3fe 100644
--- a/datastore/src/main/java/net/jami/datastore/dao/DeviceDao.java
+++ b/datastore/src/main/java/net/jami/datastore/dao/DeviceDao.java
@@ -66,7 +66,7 @@ public class DeviceDao extends AbstractDao<Device> {
"VALUES " +
"(?, ?, ?, ?, ?)");
ps = object.getInsert(ps);
- return ps.execute();
+ return ps.executeUpdate() != 0;
}
catch (Exception e){
log.error("An error has occurred while trying to store a user: " + e.toString());
diff --git a/datastore/src/main/java/net/jami/datastore/dao/SystemDao.java b/datastore/src/main/java/net/jami/datastore/dao/SystemDao.java
index 5f0a9df5..16ab23ef 100644
--- a/datastore/src/main/java/net/jami/datastore/dao/SystemDao.java
+++ b/datastore/src/main/java/net/jami/datastore/dao/SystemDao.java
@@ -64,7 +64,7 @@ public class SystemDao extends AbstractDao<SystemAccount> {
"VALUES " +
"(?, ?, ?)");
ps = object.getInsert(ps);
- return ps.execute();
+ return ps.executeUpdate() != 0;
}
catch (Exception e){
log.error("An error has occurred while trying to store a system entity: " + e.toString());
diff --git a/datastore/src/main/java/net/jami/datastore/dao/UserDao.java b/datastore/src/main/java/net/jami/datastore/dao/UserDao.java
index 2c46552e..02db1340 100644
--- a/datastore/src/main/java/net/jami/datastore/dao/UserDao.java
+++ b/datastore/src/main/java/net/jami/datastore/dao/UserDao.java
@@ -72,7 +72,7 @@ public class UserDao extends AbstractDao<User> {
"VALUES " +
"(?, ?, ?, ?, ?, ?, ?,?, ?,?, ?)");
ps = object.getInsert(ps);
- return ps.execute();
+ return ps.executeUpdate() != 0;
}
catch (Exception e){
log.error("An error has occurred while trying to store a user: " + e.toString());
--
GitLab