X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2FdaoImp%2FSystemLogDbDaoImpl.java;h=46aed213fe156b3780618bd69ea87886ed16daff;hp=49024ba0d31703eb697b7ffbc63b6d2797c8d7c5;hb=d4e3a1b394715c6386f963130e4e081d421ecd1b;hpb=2e138a7997326fcf47c7d1be230dab24a4ca8cd1

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java
index 49024ba0d..46aed213f 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/daoImp/SystemLogDbDaoImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 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.
@@ -20,95 +20,83 @@
 
 package org.onap.policy.daoImp;
 
-
 import java.util.List;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
-import org.springframework.stereotype.Service;
-
-import org.onap.policy.xacml.api.XACMLErrorConstants;
-
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Restrictions;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.conf.HibernateSession;
 import org.onap.policy.controller.PolicyController;
 import org.onap.policy.dao.SystemLogDbDao;
-import org.onap.policy.rest.jpa.SystemLogDB;
-import org.onap.policy.common.logging.flexlogger.FlexLogger; 
-import org.onap.policy.common.logging.flexlogger.Logger;
-
+import org.onap.policy.rest.jpa.SystemLogDb;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.springframework.stereotype.Service;
 
 @Service("SystemLogDbDao")
 public class SystemLogDbDaoImpl implements SystemLogDbDao {
-	private static final Logger logger = FlexLogger.getLogger(SystemLogDbDaoImpl.class);
-	
-	private static boolean jUnit = false;
-	
-	public static boolean isjUnit() {
-		return jUnit;
-	}
-
-	public static void setjUnit(boolean jUnit) {
-		SystemLogDbDaoImpl.jUnit = jUnit;
-	}
+    private static final Logger logger = FlexLogger.getLogger(SystemLogDbDaoImpl.class);
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<SystemLogDB> getLoggingData() {
-		Session session = HibernateSession.getSession();
-		Transaction tx = session.beginTransaction();
-		List<SystemLogDB> system = null;
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<SystemLogDb> getLoggingData() {
+        Session session = HibernateSession.getSession();
+        Transaction tx = session.beginTransaction();
+        List<SystemLogDb> system = null;
         try {
-        	String sqlWhere = null;
-        	if(jUnit){
-        		sqlWhere = "";
-        	}else{
-        		sqlWhere = "date > DATE_SUB(curdate(), INTERVAL 5 DAY) ORDER BY date DESC limit "+PolicyController.getLogTableLimit()+"";
-        	}
-        	Criteria cr = session.createCriteria(SystemLogDB.class);
-        	cr.add(Restrictions.sqlRestriction(sqlWhere));
+            String sqlWhere = null;
+            if (PolicyController.isjUnit()) {
+                sqlWhere = "";
+            } else {
+                sqlWhere = "date > DATE_SUB(curdate(), INTERVAL 5 DAY) ORDER BY date DESC limit "
+                        + PolicyController.getLogTableLimit() + "";
+            }
+            Criteria cr = session.createCriteria(SystemLogDb.class);
+            cr.add(Restrictions.sqlRestriction(sqlWhere));
             system = cr.list();
-			tx.commit();
-		} catch (Exception e) {
-			logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying SystemLogDB Table"+e);	
-		}finally{
-			try{
-				session.close();
-			}catch(Exception e1){
-				logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Closing Connection/Statement"+e1);
-			}
-		}
-		return system;
-	}
+            tx.commit();
+        } catch (Exception e) {
+            logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying SystemLogDb Table" + e);
+        } finally {
+            try {
+                session.close();
+            } catch (Exception e1) {
+                logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Closing Connection/Statement" + e1);
+            }
+        }
+        return system;
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<SystemLogDB> getSystemAlertData() {
-		Session session = HibernateSession.getSession();;
-		Transaction tx = session.beginTransaction();
-		List<SystemLogDB> system = null;
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<SystemLogDb> getSystemAlertData() {
+        Session session = HibernateSession.getSession();
+        Transaction tx = session.beginTransaction();
+        List<SystemLogDb> system = null;
         try {
-        	String sqlWhere = null;
-        	if(jUnit){
-        		sqlWhere = "";
-        	}else{
-        		sqlWhere = "date > DATE_SUB(curdate(), INTERVAL 5 DAY) and logtype = 'error' ORDER BY date DESC limit "+PolicyController.getSystemAlertTableLimit()+"";
-        	}
-        	Criteria cr = session.createCriteria(SystemLogDB.class);
-        	cr.add(Restrictions.sqlRestriction(sqlWhere));
+            String sqlWhere = null;
+            if (PolicyController.isjUnit()) {
+                sqlWhere = "";
+            } else {
+                sqlWhere = "date > DATE_SUB(curdate(), INTERVAL 5 DAY) and logtype = 'error' ORDER BY date DESC limit "
+                        + PolicyController.getSystemAlertTableLimit() + "";
+            }
+            Criteria cr = session.createCriteria(SystemLogDb.class);
+            cr.add(Restrictions.sqlRestriction(sqlWhere));
             system = cr.list();
-			tx.commit();
-		} catch (Exception e) {
-			logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying SystemLogDB Table"+e);	
-		}finally{
-			try{
-				session.close();
-			}catch(Exception e1){
-				logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Closing Connection/Statement"+e1);
-			}
-		}
-		return system;
-	}
+            tx.commit();
+        } catch (Exception e) {
+            logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying SystemLogDb Table" + e);
+        } finally {
+            try {
+                session.close();
+            } catch (Exception e1) {
+                logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Closing Connection/Statement" + e1);
+            }
+        }
+        return system;
+    }
 
 }