From 04683a86d81eefb61e337b073e851de47a61e769 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Tue, 8 Sep 2020 12:43:37 +0200 Subject: [PATCH] Set bulkDelete's parameters to be non null --- .../main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java index d2b9354..4a3c436 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/AbstractCRUDDAO.java @@ -341,7 +341,7 @@ public abstract class AbstractCRUDDAO public static final String EX_UUID = "__exclude_uuid__"; private int bulkDelete(String field, Object value, boolean notUuid) { - if (value == null) return bulkDeleteWhere(field + " IS NULL", null); + if (value == null) return bulkDeleteWhere(field + " IS NULL", new HashMap<>()); if (notUuid) { final var params = new HashMap(); @@ -353,11 +353,11 @@ public abstract class AbstractCRUDDAO return bulkDeleteWhere(field + " = :" + field, new SingletonMap(field, value)); } - public int bulkDeleteWhere(@NonNull final String whereClause, @Nullable final Map parameters) { + public int bulkDeleteWhere(@NonNull final String whereClause, @NonNull final Map parameters) { final Session session = getHibernateTemplate().getSessionFactory().getCurrentSession(); final String deleteSql = "DELETE FROM " + getEntityClass().getSimpleName() + " WHERE " + whereClause; final Query query = session.createQuery(deleteSql); - if (!empty(parameters)) parameters.forEach(query::setParameter); + parameters.forEach(query::setParameter); final int count = query.executeUpdate(); session.setFlushMode(FlushMode.COMMIT); session.flush();