1 files changed, 67 insertions, 62 deletions

diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImpl.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImpl.java
index 8fdb64fc..3208997f 100644
--- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImpl.java
+++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/dao/WorkflowDAOImpl.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -45,83 +45,88 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.workflow.models.Workflow;
 import org.onap.portalsdk.workflow.models.WorkflowLite;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
+
 @Repository
-public class WorkflowDAOImpl implements WorkflowDAO{
-	
+public class WorkflowDAOImpl implements WorkflowDAO {
+
+	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WorkflowDAOImpl.class);
+
 	@Autowired
 	private SessionFactory sessionFactory;
-	
-	public Workflow save(Workflow workflow, String creatorId){
-        Session session = this.sessionFactory.openSession();
-        Transaction tx = session.beginTransaction();
-        
-        try{
-        	Query query = session.createQuery("from User where loginId =:loginId");
-        	query.setParameter("loginId", creatorId);
-        	User creator = (User)(query.list().get(0));
-        	
-        	workflow.setCreatedBy(creator);
-            workflow.setCreated(new Date());
-        }
-        catch(Exception e){
-        	e.printStackTrace();
-        }
-        
-        long id = (Long) session.save(workflow);
-        Workflow savedWorkflow = (Workflow) session.get(Workflow.class, id);        
-        tx.commit();
-        session.close();
-        return savedWorkflow;
+
+	@Override
+	public Workflow save(Workflow workflow, String creatorId) {
+		Session session = this.sessionFactory.openSession();
+		Transaction tx = session.beginTransaction();
+
+		try {
+			Query query = session.createQuery("from User where loginId =:loginId");
+			query.setParameter("loginId", creatorId);
+			User creator = (User) (query.list().get(0));
+			workflow.setCreatedBy(creator);
+			workflow.setCreated(new Date());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "save failed", e);
+		}
+
+		long id = (Long) session.save(workflow);
+		Workflow savedWorkflow = (Workflow) session.get(Workflow.class, id);
+		tx.commit();
+		session.close();
+		return savedWorkflow;
 	}
-	
-	public List<Workflow> getWorkflows(){
+
+	@Override
+	public List<Workflow> getWorkflows() {
 		Session session = this.sessionFactory.openSession();
-        @SuppressWarnings("unchecked")
+		@SuppressWarnings("unchecked")
 		List<Workflow> workflows = session.createQuery("from Workflow").list();
-        session.close();
-        return workflows;
+		session.close();
+		return workflows;
 	}
 
 	@Override
 	public void delete(Long workflowId) {
 		Session session = this.sessionFactory.openSession();
-        Transaction tx = session.beginTransaction();
-        Query query = session.createQuery("delete from Workflow where id =:id");
-        query.setParameter("id", workflowId);
-        query.executeUpdate();    
-        tx.commit();
-        session.close();        	
-    }
+		Transaction tx = session.beginTransaction();
+		Query query = session.createQuery("delete from Workflow where id =:id");
+		query.setParameter("id", workflowId);
+		query.executeUpdate();
+		tx.commit();
+		session.close();
+	}
 
 	@Override
 	public Workflow edit(WorkflowLite workflowLight, String creatorId) {
-        Session session = this.sessionFactory.openSession();
-        Transaction tx = session.beginTransaction();
-        
-        Query query = session.createQuery("from User where loginId =:loginId");
-    	query.setParameter("loginId", creatorId);
-    	User creator = (User)(query.list().get(0));
-    	
-    	Workflow workflowToModify = (Workflow) session.get(Workflow.class, workflowLight.getId());
-        
-    	workflowToModify.setActive(workflowLight.getActive().equalsIgnoreCase("true") ? true : false );
-    	workflowToModify.setSuspendLink(workflowLight.getSuspendLink());
-    	workflowToModify.setRunLink(workflowLight.getRunLink());
-    	workflowToModify.setDescription(workflowLight.getDescription());
-    	workflowToModify.setWorkflowKey(workflowLight.getWorkflowKey());
-    	workflowToModify.setName(workflowLight.getName());
-    	
-    	workflowToModify.setModifiedBy(creator);
-    	workflowToModify.setLastUpdated(new Date());
-        
-        session.update(workflowToModify);
-        Workflow savedWorkflow = (Workflow) session.get(Workflow.class, workflowLight.getId());
-        tx.commit();
-        session.close();
-        return savedWorkflow;
+		Session session = this.sessionFactory.openSession();
+		Transaction tx = session.beginTransaction();
+
+		Query query = session.createQuery("from User where loginId =:loginId");
+		query.setParameter("loginId", creatorId);
+		User creator = (User) (query.list().get(0));
+
+		Workflow workflowToModify = (Workflow) session.get(Workflow.class, workflowLight.getId());
+
+		final boolean active = "true".equalsIgnoreCase(workflowLight.getActive()) ? true : false;
+		workflowToModify.setActive(active);
+		workflowToModify.setSuspendLink(workflowLight.getSuspendLink());
+		workflowToModify.setRunLink(workflowLight.getRunLink());
+		workflowToModify.setDescription(workflowLight.getDescription());
+		workflowToModify.setWorkflowKey(workflowLight.getWorkflowKey());
+		workflowToModify.setName(workflowLight.getName());
+
+		workflowToModify.setModifiedBy(creator);
+		workflowToModify.setLastUpdated(new Date());
+
+		session.update(workflowToModify);
+		Workflow savedWorkflow = (Workflow) session.get(Workflow.class, workflowLight.getId());
+		tx.commit();
+		session.close();
+		return savedWorkflow;
 	}
 }