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

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 fd4da86..7edab42 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
@@ -1,40 +1,36 @@
 /*
  * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 package org.akraino.validation.ui.daoimpl;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
 import org.akraino.validation.ui.dao.SubmissionDAO;
 import org.akraino.validation.ui.entity.Submission;
-import org.apache.log4j.Logger;
+import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.query.Query;
+import org.hibernate.criterion.Restrictions;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class SubmissionDAOImpl implements SubmissionDAO {
 
-    private static final Logger LOGGER = Logger.getLogger(SubmissionDAOImpl.class);
+    private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(SubmissionDAOImpl.class);
 
     @Autowired
     private SessionFactory sessionFactory;
@@ -45,43 +41,30 @@ public class SubmissionDAOImpl implements SubmissionDAO {
 
     @Override
     public List<Submission> getSubmissions() {
-
-        CriteriaBuilder builder = getSession().getCriteriaBuilder();
-        CriteriaQuery<Submission> criteria = builder.createQuery(Submission.class);
-
-        Root<Submission> root = criteria.from(Submission.class);
-        criteria.select(root);
-
-        Query<Submission> query = getSession().createQuery(criteria);
-
-        return query.getResultList();
-
+        Criteria criteria = getSession().createCriteria(Submission.class);
+        return criteria.list();
     }
 
     @Override
     public Submission getSubmission(Integer submissionId) {
-
-        EntityManager entityManager = getSession().getEntityManagerFactory().createEntityManager();
-
-        return entityManager.find(Submission.class, submissionId);
+        Criteria criteria = getSession().createCriteria(Submission.class);
+        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) {
         getSession().saveOrUpdate(submission);
-
     }
 
     @Override
     public void merge(Submission submission) {
         getSession().merge(submission);
-
     }
 
     @Override
     public void deleteSubmission(Submission submission) {
         getSession().delete(submission);
-
     }
 
     @Override
@@ -91,13 +74,8 @@ public class SubmissionDAOImpl implements SubmissionDAO {
 
     @Override
     public void deleteAll() {
-
-        Query<?> query = getSession().createQuery("delete from Submission");
-
-        int result = query.executeUpdate();
-
-        if (result > 0) {
-            LOGGER.info("All submission entries are cleaned up");
+        if (getSession().createQuery("delete from Submission").executeUpdate() > 0) {
+            LOGGER.info(EELFLoggerDelegate.applicationLogger, "All submission entries are cleaned up");
         }
     }