X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fdaoimpl%2FSubmissionDAOImpl.java;h=eb737b2024e76050f34dfca6c4baa45e9e00c399;hb=147ecf7bf79ea9967a121d0038103151a38ebef2;hp=7edab42cb43b618b68ad675872e5baeaaa92bc08;hpb=d397f244c7a923b08df9d6488981e3d22c999c0f;p=validation.git

diff --git a/ui/src/main/java/org/akraino/validation/ui/daoimpl/SubmissionDAOImpl.java b/ui/src/main/java/org/akraino/validation/ui/daoimpl/SubmissionDAOImpl.java
index 7edab42..eb737b2 100644
--- a/ui/src/main/java/org/akraino/validation/ui/daoimpl/SubmissionDAOImpl.java
+++ b/ui/src/main/java/org/akraino/validation/ui/daoimpl/SubmissionDAOImpl.java
@@ -17,6 +17,8 @@ package org.akraino.validation.ui.daoimpl;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.akraino.validation.ui.dao.SubmissionDAO;
 import org.akraino.validation.ui.entity.Submission;
 import org.hibernate.Criteria;
@@ -42,40 +44,47 @@ public class SubmissionDAOImpl implements SubmissionDAO {
     @Override
     public List<Submission> getSubmissions() {
         Criteria criteria = getSession().createCriteria(Submission.class);
+        criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
         return criteria.list();
     }
 
     @Override
-    public Submission getSubmission(Integer submissionId) {
+    public Submission getSubmission(@Nonnull Integer submissionId) {
         Criteria criteria = getSession().createCriteria(Submission.class);
+        criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
         criteria.add(Restrictions.eq("id", submissionId));
         return criteria.list() == null || criteria.list().size() < 1 ? null : (Submission) criteria.list().get(0);
     }
 
     @Override
-    public void saveOrUpdate(Submission submission) {
+    public void saveOrUpdate(@Nonnull Submission submission) {
         getSession().saveOrUpdate(submission);
+        getSession().flush();
     }
 
     @Override
-    public void merge(Submission submission) {
+    public void merge(@Nonnull Submission submission) {
         getSession().merge(submission);
+        getSession().flush();
     }
 
     @Override
-    public void deleteSubmission(Submission submission) {
+    public void deleteSubmission(@Nonnull Submission submission) {
         getSession().delete(submission);
+        getSession().flush();
     }
 
     @Override
-    public void deleteSubmission(Integer submissionId) {
+    public void deleteSubmission(@Nonnull Integer submissionId) {
         getSession().delete(this.getSubmission(submissionId));
+        getSession().flush();
     }
 
     @Override
     public void deleteAll() {
         if (getSession().createQuery("delete from Submission").executeUpdate() > 0) {
             LOGGER.info(EELFLoggerDelegate.applicationLogger, "All submission entries are cleaned up");
+            getSession().flush();
         }
     }