JUnit/SONAR/Checkstyle in ONAP-REST

Cleanup of the dao-impl package in ONAP-REST

All enclosing try/catch blocks removed.

Issue-ID: POLICY-2131
Change-Id: Iec73fc5a85b891a00ba8c029e9904051c51284c2
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImpl.java b/ONAP-REST/src/main/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImpl.java
index 66401cc..f64b9ce 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImpl.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImpl.java
@@ -3,13 +3,14 @@
  * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * Modifications Copyright (C) 2019 Nordix Foundation.

  * ================================================================================
  * 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.
  * 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.


@@ -17,6 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */

+

 package org.onap.policy.rest.daoimpl;
 
 import java.util.ArrayList;
 package org.onap.policy.rest.daoimpl;
 
 import java.util.ArrayList;


@@ -45,28 +47,28 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 import org.springframework.stereotype.Component;
 
 @Component

-public class PolicyValidationDaoImpl implements CommonClassDao{
+public class PolicyValidationDaoImpl implements CommonClassDao {

 
     private static final Logger LOGGER = FlexLogger.getLogger(PolicyValidationDaoImpl.class);
     private static final String DB_CONNECTION_CLOSING_ERROR = "Error While Closing Connection/Statement";
     private static final String DBTABLE_QUERY_ERROR = "Error While Querying Table";
     private static SessionFactory sessionfactory;
 
     private static final Logger LOGGER = FlexLogger.getLogger(PolicyValidationDaoImpl.class);
     private static final String DB_CONNECTION_CLOSING_ERROR = "Error While Closing Connection/Statement";
     private static final String DBTABLE_QUERY_ERROR = "Error While Querying Table";
     private static SessionFactory sessionfactory;

-    
-    public static SessionFactory getSessionfactory() {
-          return sessionfactory;
+
+    @Autowired
+    private PolicyValidationDaoImpl(SessionFactory sessionfactory) {
+        PolicyValidationDaoImpl.sessionfactory = sessionfactory;

     }
 
     }
 

-    public static void setSessionfactory(SessionFactory sessionfactory) {
-          PolicyValidationDaoImpl.sessionfactory = sessionfactory;
+    public PolicyValidationDaoImpl() {
+        // Default Constructor

     }
 
     }
 

-    @Autowired
-    private PolicyValidationDaoImpl(SessionFactory sessionfactory){
-          PolicyValidationDaoImpl.sessionfactory = sessionfactory;
+    public static SessionFactory getSessionfactory() {
+        return sessionfactory;

     }
     }

-    
-    public PolicyValidationDaoImpl(){
-          //Default Constructor
+
+    public static void setSessionfactory(SessionFactory sessionfactory) {
+        PolicyValidationDaoImpl.sessionfactory = sessionfactory;

     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })


@@ -74,16 +76,16 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
     public List<Object> getData(Class className) {
         Session session = sessionfactory.openSession();
         List<Object> data = null;
     public List<Object> getData(Class className) {
         Session session = sessionfactory.openSession();
         List<Object> data = null;

-        try{
+        try {

             Criteria cr = session.createCriteria(className);
             data = cr.list();
             Criteria cr = session.createCriteria(className);
             data = cr.list();

-        }catch(Exception e){
+        } catch (Exception e) {

             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e){
-                LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR+e);
+            } catch (Exception e) {
+                LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e);

             }
         }
         return data;
             }
         }
         return data;


@@ -97,22 +99,22 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         List<Object> data = null;
         try {
             Criteria cr = session.createCriteria(className);
         List<Object> data = null;
         try {
             Criteria cr = session.createCriteria(className);

-            if(columnName.contains(":") && key.contains(":")){
+            if (columnName.contains(":") && key.contains(":")) {

                 String[] columns = columnName.split(":");
                 String[] keys = key.split(":");
                 String[] columns = columnName.split(":");
                 String[] keys = key.split(":");

-                for(int i=0; i < columns.length; i++){
+                for (int i = 0; i < columns.length; i++) {

                     cr.add(Restrictions.eq(columns[i], keys[i]));
                 }
                     cr.add(Restrictions.eq(columns[i], keys[i]));
                 }

-            }else{
+            } else {

                 cr.add(Restrictions.eq(columnName, key));
             }
             data = cr.list();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
                 cr.add(Restrictions.eq(columnName, key));
             }
             data = cr.list();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -126,12 +128,12 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         try {
             session.persist(entity);
             tx.commit();
         try {
             session.persist(entity);
             tx.commit();

-        }catch(Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Saving data to Table"+e);
-        }finally{
-            try{
+        } catch (Exception e) {
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Saving data to Table" + e);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -145,12 +147,12 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         try {
             session.delete(entity);
             tx.commit();
         try {
             session.delete(entity);
             tx.commit();

-        }catch(Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Deleting data from Table"+e);
-        }finally{
-            try{
+        } catch (Exception e) {
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Deleting data from Table" + e);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -165,12 +167,12 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         try {
             session.update(entity);
             tx.commit();
         try {
             session.update(entity);
             tx.commit();

-        }catch(Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Updating data to Table"+e);
-        }finally{
-            try{
+        } catch (Exception e) {
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Updating data to Table" + e);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -185,30 +187,31 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         Transaction tx = session.beginTransaction();
         List<Object> data = null;
         String[] columnNames = null;
         Transaction tx = session.beginTransaction();
         List<Object> data = null;
         String[] columnNames = null;

-        if(columnName != null && columnName.contains(":")){
+        if (columnName != null && columnName.contains(":")) {

             columnNames = columnName.split(":");
         }
         String[] values = null;
             columnNames = columnName.split(":");
         }
         String[] values = null;

-        if(value != null && value.contains(":")){
+        if (value != null && value.contains(":")) {

             values = value.split(":");
         }
         try {
             Criteria cr = session.createCriteria(className);
             values = value.split(":");
         }
         try {
             Criteria cr = session.createCriteria(className);

-            if(columnNames != null && values != null && columnNames.length == values.length){
-                for (int i = 0; i < columnNames.length; i++){
-                    cr.add(Restrictions.eq(columnNames[i],values[i]));
+            if (columnNames != null && values != null && columnNames.length == values.length) {
+                for (int i = 0; i < columnNames.length; i++) {
+                    cr.add(Restrictions.eq(columnNames[i], values[i]));

                 }
                 }

-            }else{
-                cr.add(Restrictions.eq(columnName,value));
+            } else {
+                cr.add(Restrictions.eq(columnName, value));

             }
             data = cr.list();
             tx.commit();
         } catch (Exception e) {
             }
             data = cr.list();
             tx.commit();
         } catch (Exception e) {

-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying for Duplicate Entries for Table"+e + className);
-        }finally{
-            try{
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying for Duplicate Entries for Table"
+                    + e + className);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -223,13 +226,13 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         Transaction tx = session.beginTransaction();
         List<PolicyRoles> rolesData = null;
         try {
         Transaction tx = session.beginTransaction();
         List<PolicyRoles> rolesData = null;
         try {

-            Criteria cr = session.createCriteria(PolicyRoles.class);
-            Disjunction disjunction = Restrictions.disjunction();
-            Conjunction conjunction1  = Restrictions.conjunction();
+            final Criteria cr = session.createCriteria(PolicyRoles.class);
+            final Disjunction disjunction = Restrictions.disjunction();
+            Conjunction conjunction1 = Restrictions.conjunction();

             conjunction1.add(Restrictions.eq("role", "admin"));
             conjunction1.add(Restrictions.eq("role", "admin"));

-            Conjunction conjunction2  = Restrictions.conjunction();
+            Conjunction conjunction2 = Restrictions.conjunction();

             conjunction2.add(Restrictions.eq("role", "editor"));
             conjunction2.add(Restrictions.eq("role", "editor"));

-            Conjunction conjunction3  = Restrictions.conjunction();
+            Conjunction conjunction3 = Restrictions.conjunction();

             conjunction3.add(Restrictions.eq("role", "guest"));
             disjunction.add(conjunction1);
             disjunction.add(conjunction2);
             conjunction3.add(Restrictions.eq("role", "guest"));
             disjunction.add(conjunction1);
             disjunction.add(conjunction2);


@@ -237,11 +240,11 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
             rolesData = cr.add(disjunction).list();
             tx.commit();
         } catch (Exception e) {
             rolesData = cr.add(disjunction).list();
             tx.commit();
         } catch (Exception e) {

-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying PolicyRoles Table"+e);
-        }finally{
-            try{
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Querying PolicyRoles Table" + e);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -270,10 +273,9 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         try {
             Query hbquery = session.createQuery(query);
             for (Map.Entry<String, Object> paramPair : params.entrySet()) {
         try {
             Query hbquery = session.createQuery(query);
             for (Map.Entry<String, Object> paramPair : params.entrySet()) {

-                if(paramPair.getValue() instanceof java.lang.Long){
+                if (paramPair.getValue() instanceof java.lang.Long) {

                     hbquery.setLong(paramPair.getKey(), (long) paramPair.getValue());
                     hbquery.setLong(paramPair.getKey(), (long) paramPair.getValue());

-                }
-                else{
+                } else {

                     hbquery.setParameter(paramPair.getKey(), paramPair.getValue());
                 }
             }
                     hbquery.setParameter(paramPair.getKey(), paramPair.getValue());
                 }
             }


@@ -282,10 +284,10 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
             throw e;
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
             throw e;

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(HibernateException e1){
+            } catch (HibernateException e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -301,23 +303,23 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
         Object data = null;
         try {
             Criteria cr = session.createCriteria(className);
         Object data = null;
         try {
             Criteria cr = session.createCriteria(className);

-            if(columnName.contains(":") && key.contains(":")){
+            if (columnName.contains(":") && key.contains(":")) {

                 String[] columns = columnName.split(":");
                 String[] keys = key.split(":");
                 String[] columns = columnName.split(":");
                 String[] keys = key.split(":");

-                for(int i=0; i < columns.length; i++){
+                for (int i = 0; i < columns.length; i++) {

                     cr.add(Restrictions.eq(columns[i], keys[i]));
                 }
                     cr.add(Restrictions.eq(columns[i], keys[i]));
                 }

-            }else{
+            } else {

                 cr.add(Restrictions.eq(columnName, key));
             }
             data = cr.list().get(0);
             tx.commit();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
                 cr.add(Restrictions.eq(columnName, key));
             }
             data = cr.list().get(0);
             tx.commit();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -346,11 +348,11 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
             hbquery.executeUpdate();
             tx.commit();
         } catch (Exception e) {
             hbquery.executeUpdate();
             tx.commit();
         } catch (Exception e) {

-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Updating Database Table"+e);
-        }finally{
-            try{
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error While Updating Database Table" + e);
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }


@@ -363,16 +365,16 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
     public List<String> getDataByColumn(Class className, String columnName) {
         Session session = sessionfactory.openSession();
         List<String> data = null;
     public List<String> getDataByColumn(Class className, String columnName) {
         Session session = sessionfactory.openSession();
         List<String> data = null;

-        try{
+        try {

             Criteria cr = session.createCriteria(className);
             cr.setProjection(Projections.property(columnName));
             data = cr.list();
             Criteria cr = session.createCriteria(className);
             cr.setProjection(Projections.property(columnName));
             data = cr.list();

-        }catch(Exception e){
+        } catch (Exception e) {

             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + e);

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e){
+            } catch (Exception e) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e);
             }
         }


@@ -391,24 +393,24 @@ public class PolicyValidationDaoImpl implements CommonClassDao{
             Disjunction disjunction = Restrictions.disjunction();
             List<Conjunction> conjunctionList = new ArrayList<>();
             String[] columNames = columnName.split(":");
             Disjunction disjunction = Restrictions.disjunction();
             List<Conjunction> conjunctionList = new ArrayList<>();
             String[] columNames = columnName.split(":");

-            for(int i =0; i < data.size(); i++){
+            for (int i = 0; i < data.size(); i++) {

                 String[] entiySplit = data.get(i).split(":");
                 Conjunction conjunction = Restrictions.conjunction();
                 conjunction.add(Restrictions.eq(columNames[0], entiySplit[0]));
                 conjunction.add(Restrictions.eq(columNames[1], entiySplit[1]));
                 conjunctionList.add(conjunction);
             }
                 String[] entiySplit = data.get(i).split(":");
                 Conjunction conjunction = Restrictions.conjunction();
                 conjunction.add(Restrictions.eq(columNames[0], entiySplit[0]));
                 conjunction.add(Restrictions.eq(columNames[1], entiySplit[1]));
                 conjunctionList.add(conjunction);
             }

-            for(int j =0 ; j < conjunctionList.size(); j++){
+            for (int j = 0; j < conjunctionList.size(); j++) {

                 disjunction.add(conjunctionList.get(j));
             }
             entityData = cr.add(disjunction).list();
             tx.commit();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + className + e);
                 disjunction.add(conjunctionList.get(j));
             }
             entityData = cr.add(disjunction).list();
             tx.commit();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DBTABLE_QUERY_ERROR + className + e);

-        }finally{
-            try{
+        } finally {
+            try {

                 session.close();
                 session.close();

-            }catch(Exception e1){
+            } catch (Exception e1) {

                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + DB_CONNECTION_CLOSING_ERROR + e1);
             }
         }

diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
index 299e800..4d9d1c5 100644 (file)
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Modifications copyright (c) 2019 Nokia

+ * Modifications Copyright (C) 2019 Nordix Foundation.

  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -18,11 +19,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */

+

 package org.onap.policy.rest.daoimpl;
 
 package org.onap.policy.rest.daoimpl;
 

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;

 
 import java.io.File;
 
 import java.io.File;

+import java.sql.SQLException;

 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;


@@ -50,9 +57,8 @@ import org.onap.policy.rest.jpa.SystemLogDB;
 import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.rest.jpa.WatchPolicyNotificationTable;
 import org.springframework.orm.hibernate4.LocalSessionFactoryBuilder;
 import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.rest.jpa.WatchPolicyNotificationTable;
 import org.springframework.orm.hibernate4.LocalSessionFactoryBuilder;

-import org.springframework.transaction.annotation.Transactional;

 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.annotation.Rollback;

-
+import org.springframework.transaction.annotation.Transactional;

 
 public class PolicyValidationDaoImplTest {
 
 
 public class PolicyValidationDaoImplTest {
 


@@ -62,55 +68,51 @@ public class PolicyValidationDaoImplTest {
     static Server server;
     static PolicyValidationDaoImpl commonClassDao;
 
     static Server server;
     static PolicyValidationDaoImpl commonClassDao;
 

+    /**
+     * Set up all unit tests.
+     * @throws SQLException on SQL exceptions
+     */

     @BeforeClass
     @BeforeClass

-    public static void setupAll() {
-        try {
-            BasicDataSource dataSource = new BasicDataSource();
-            dataSource.setDriverClassName("org.h2.Driver");
-            // In-memory DB for testing
-            dataSource.setUrl("jdbc:h2:mem:test");
-            dataSource.setUsername("sa");
-            dataSource.setPassword("");
-            LocalSessionFactoryBuilder sessionBuilder = new LocalSessionFactoryBuilder(dataSource);
-            sessionBuilder.scanPackages("org.onap.*", "com.*");
-
-            Properties properties = new Properties();
-            properties.put("hibernate.show_sql", "false");
-            properties.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
-            properties.put("hibernate.hbm2ddl.auto", "drop");
-            properties.put("hibernate.hbm2ddl.auto", "create");
-
-            sessionBuilder.addProperties(properties);
-            sessionFactory = sessionBuilder.buildSessionFactory();
-
-            // Set up dao with SessionFactory
-            commonClassDao = new PolicyValidationDaoImpl();
-            PolicyValidationDaoImpl.setSessionfactory(sessionFactory);
-            //PolicyController.setLogTableLimit("1");
-            //HibernateSession.setSession(sessionFactory);
-            SystemLogDB data1 = new SystemLogDB();
-            data1.setDate(new Date());
-            data1.setLogtype("INFO");
-            data1.setRemote("Test");
-            data1.setSystem("Test");
-            data1.setType("Test");
-            SystemLogDB data2 = new SystemLogDB();
-            data2.setDate(new Date());
-            data2.setLogtype("error");
-            data2.setRemote("Test");
-            data2.setSystem("Test");
-            data2.setType("Test");
-            //HibernateSession.getSession().save(data1);
-            //HibernateSession.getSession().save(data2);
-
-            // Create TCP server for troubleshooting
-            server = Server.createTcpServer("-tcpAllowOthers").start();
-            System.out.println("URL: jdbc:h2:" + server.getURL() + "/mem:test");
-
-        }catch(Exception e){
-            System.err.println(e);
-            fail();
-        }
+    public static void setupAll() throws SQLException {
+        BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName("org.h2.Driver");
+        // In-memory DB for testing
+        dataSource.setUrl("jdbc:h2:mem:test");
+        dataSource.setUsername("sa");
+        dataSource.setPassword("");
+        LocalSessionFactoryBuilder sessionBuilder = new LocalSessionFactoryBuilder(dataSource);
+        sessionBuilder.scanPackages("org.onap.*", "com.*");
+
+        Properties properties = new Properties();
+        properties.put("hibernate.show_sql", "false");
+        properties.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+        properties.put("hibernate.hbm2ddl.auto", "drop");
+        properties.put("hibernate.hbm2ddl.auto", "create");
+
+        sessionBuilder.addProperties(properties);
+        sessionFactory = sessionBuilder.buildSessionFactory();
+
+        // Set up dao with SessionFactory
+        commonClassDao = new PolicyValidationDaoImpl();
+        PolicyValidationDaoImpl.setSessionfactory(sessionFactory);
+        // PolicyController.setLogTableLimit("1");
+        // HibernateSession.setSession(sessionFactory);
+        SystemLogDB data1 = new SystemLogDB();
+        data1.setDate(new Date());
+        data1.setLogtype("INFO");
+        data1.setRemote("Test");
+        data1.setSystem("Test");
+        data1.setType("Test");
+        SystemLogDB data2 = new SystemLogDB();
+        data2.setDate(new Date());
+        data2.setLogtype("error");
+        data2.setRemote("Test");
+        data2.setSystem("Test");
+        data2.setType("Test");
+
+        // Create TCP server for troubleshooting
+        server = Server.createTcpServer("-tcpAllowOthers").start();
+        System.out.println("URL: jdbc:h2:" + server.getURL() + "/mem:test");

     }
 
     @AfterClass
     }
 
     @AfterClass


@@ -127,324 +129,484 @@ public class PolicyValidationDaoImplTest {
     @Test
     @Transactional
     @Rollback(true)
     @Test
     @Transactional
     @Rollback(true)

-    public void testDB(){
-        try{
-            // Add data
-            UserInfo userinfo = new UserInfo();
-            userinfo.setUserLoginId("Test");
-            userinfo.setUserName("Test");
-            commonClassDao.save(userinfo);
-            OnapName onapName = new OnapName();
-            onapName.setOnapName("Test");
-            onapName.setUserCreatedBy(userinfo);
-            onapName.setUserModifiedBy(userinfo);
-            onapName.setModifiedDate(new Date());
-            commonClassDao.save(onapName);
-
-
-            List<Object> list = commonClassDao.getData(OnapName.class);
-            assertTrue(list.size() == 1);
-            logger.debug(list.size());
-            logger.debug(list.get(0));
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void testDB() {
+        // Add data
+        UserInfo userinfo = new UserInfo();
+        userinfo.setUserLoginId("Test");
+        userinfo.setUserName("Test");
+        commonClassDao.save(userinfo);
+        OnapName onapName = new OnapName();
+        onapName.setOnapName("Test");
+        onapName.setUserCreatedBy(userinfo);
+        onapName.setUserModifiedBy(userinfo);
+        onapName.setModifiedDate(new Date());
+        commonClassDao.save(onapName);
+
+
+        List<Object> list = commonClassDao.getData(OnapName.class);
+        assertTrue(list.size() == 1);
+        logger.debug(list.size());
+        logger.debug(list.get(0));

     }
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
     @Test
     @Transactional
     @Rollback(true)

-    public void testUser(){
-        try{
-            // Add data
-            UserInfo userinfo = new UserInfo();
-            String loginId_userName = "Test";
-            userinfo.setUserLoginId(loginId_userName);
-            userinfo.setUserName(loginId_userName);
-            commonClassDao.save(userinfo);
+    public void testUser() {
+        // Add data
+        UserInfo userinfo = new UserInfo();
+        String loginIdUserName = "Test";
+        userinfo.setUserLoginId(loginIdUserName);
+        userinfo.setUserName(loginIdUserName);
+        commonClassDao.save(userinfo);

 
 
 
 

-            List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
+        List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());

 
 

-            assertEquals(1, dataCur.size());
-            UserInfo cur = (UserInfo) dataCur.get(0);
-            assertEquals(loginId_userName, cur.getUserLoginId());
-            assertEquals(loginId_userName, cur.getUserName());
+        assertEquals(1, dataCur.size());
+        UserInfo cur = (UserInfo) dataCur.get(0);
+        assertEquals(loginIdUserName, cur.getUserLoginId());
+        assertEquals(loginIdUserName, cur.getUserName());

 
 

-            assertFalse(dataCur.isEmpty());
-
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+        assertFalse(dataCur.isEmpty());

     }
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_DashboardController(){
-        try{
-            // Add data
-            PolicyEntity pe = new PolicyEntity();
-            String name = "TestPolicy";
-            pe.setPolicyName(name);
-            pe.setPolicyData("dummyData");
-            pe.prePersist();
-            pe.setScope("dummyScope");
-            pe.setDescription("descr");
-            pe.setDeleted(false);
-            pe.setCreatedBy("Test");
-            commonClassDao.save(pe);
-
-            List<Object> dataCur = commonClassDao.getDataByQuery("from PolicyEntity", new SimpleBindings());
-
-            assertTrue(1 == dataCur.size());
-            assertTrue( dataCur.get(0) instanceof PolicyEntity);
-            assertEquals( name,  ((PolicyEntity)dataCur.get(0)).getPolicyName());
-            assertEquals( pe, ((PolicyEntity)dataCur.get(0)));
-
-
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void getDataByQuery_DashboardController() {
+        // Add data
+        PolicyEntity pe = new PolicyEntity();
+        String name = "TestPolicy";
+        pe.setPolicyName(name);
+        pe.setPolicyData("dummyData");
+        pe.prePersist();
+        pe.setScope("dummyScope");
+        pe.setDescription("descr");
+        pe.setDeleted(false);
+        pe.setCreatedBy("Test");
+        commonClassDao.save(pe);
+
+        List<Object> dataCur = commonClassDao.getDataByQuery("from PolicyEntity", new SimpleBindings());
+
+        assertTrue(1 == dataCur.size());
+        assertTrue(dataCur.get(0) instanceof PolicyEntity);
+        assertEquals(name, ((PolicyEntity) dataCur.get(0)).getPolicyName());
+        assertEquals(pe, (dataCur.get(0)));

     }
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_AutoPushController(){
-        try{
-            // Add data
-            PolicyVersion pv = new PolicyVersion();
-            pv.setActiveVersion(2);
-            pv.setPolicyName("myPname");
-            pv.prePersist();
-            pv.setCreatedBy("Test");
-            pv.setModifiedBy("Test");
-
-            PolicyVersion pv2 = new PolicyVersion();
-            pv2.setActiveVersion(1);
-            pv2.setPolicyName("test");
-            pv2.prePersist();
-            pv2.setCreatedBy("Test");
-            pv2.setModifiedBy("Test");
-
-            commonClassDao.save(pv);
-            commonClassDao.save(pv2);
-
-            String scope = "my";
-            scope += "%";
-            String query = "From PolicyVersion where policy_name like :scope and id > 0";
-            SimpleBindings params = new SimpleBindings();
-            params.put("scope", scope);
-            List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
-
-            assertTrue(1 == dataCur.size());
-            assertEquals(pv, (PolicyVersion) dataCur.get(0));
-
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void getDataByQuery_AutoPushController() {
+        // Add data
+        PolicyVersion pv = new PolicyVersion();
+        pv.setActiveVersion(2);
+        pv.setPolicyName("myPname");
+        pv.prePersist();
+        pv.setCreatedBy("Test");
+        pv.setModifiedBy("Test");
+
+        PolicyVersion pv2 = new PolicyVersion();
+        pv2.setActiveVersion(1);
+        pv2.setPolicyName("test");
+        pv2.prePersist();
+        pv2.setCreatedBy("Test");
+        pv2.setModifiedBy("Test");
+
+        commonClassDao.save(pv);
+        commonClassDao.save(pv2);
+
+        String scope = "my";
+        scope += "%";
+        String query = "From PolicyVersion where policy_name like :scope and id > 0";
+        SimpleBindings params = new SimpleBindings();
+        params.put("scope", scope);
+        List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
+
+
+        assertTrue(1 == dataCur.size());
+        assertEquals(pv, dataCur.get(0));

     }
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_PolicyNotificationMail(){
-        try{
-            // Add data
-            WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
-            String policyFileName = "banana";
-            watch.setLoginIds("Test");
-            watch.setPolicyName("bananaWatch");
-            commonClassDao.save(watch);
-
-            if(policyFileName.contains("/")){
-                policyFileName = policyFileName.substring(0, policyFileName.indexOf("/"));
-                policyFileName = policyFileName.replace("/", File.separator);
-            }
-            if(policyFileName.contains("\\")){
-                policyFileName = policyFileName.substring(0, policyFileName.indexOf("\\"));
-                policyFileName = policyFileName.replace("\\", "\\\\");
-            }
-
-
-            // Current Implementation
-            policyFileName += "%";
-            String query = "from WatchPolicyNotificationTable where policyName like:policyFileName";
-            SimpleBindings params = new SimpleBindings();
-            params.put("policyFileName", policyFileName);
-            List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
-            // Assertions
-            assertTrue(dataCur.size() == 1);
-            assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
-            assertEquals(watch, (WatchPolicyNotificationTable) dataCur.get(0));
+    public void getDataByQuery_PolicyNotificationMail() {
+        // Add data
+        WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
+        watch.setLoginIds("Test");
+
+        // Add data
+        UserInfo userinfo = new UserInfo();
+        String loginIdUserName = "Test";
+        userinfo.setUserLoginId(loginIdUserName);
+        userinfo.setUserName(loginIdUserName);
+        commonClassDao.save(userinfo);
+

 
 

-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
+        List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
+
+        assertEquals(1, dataCur.size());
+        UserInfo cur = (UserInfo) dataCur.get(0);
+        assertEquals(loginIdUserName, cur.getUserLoginId());
+        assertEquals(loginIdUserName, cur.getUserName());
+
+        assertFalse(dataCur.isEmpty());
+
+
+        watch.setPolicyName("bananaWatch");
+        commonClassDao.save(watch);
+
+        String policyFileName = "banana";
+        if (policyFileName.contains("/")) {
+            policyFileName = policyFileName.substring(0, policyFileName.indexOf("/"));
+            policyFileName = policyFileName.replace("/", File.separator);
+        }
+        if (policyFileName.contains("\\")) {
+            policyFileName = policyFileName.substring(0, policyFileName.indexOf("\\"));
+            policyFileName = policyFileName.replace("\\", "\\\\");

         }
         }

+
+        // Current Implementation
+        policyFileName += "%";
+        String query = "from WatchPolicyNotificationTable where policyName like:policyFileName";
+        SimpleBindings params = new SimpleBindings();
+        params.put("policyFileName", policyFileName);
+        dataCur = commonClassDao.getDataByQuery(query, params);
+
+        // Assertions
+        assertTrue(dataCur.size() == 1);
+        assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
+        assertEquals(watch, dataCur.get(0));

     }
 
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_PolicyController(){
-        try{
-            // Add data
-            PolicyEntity pe = new PolicyEntity();
-            String name = "actionDummy";
-            pe.setPolicyName(name);
-            pe.setPolicyData("dummyData");
-            pe.prePersist();
-            pe.setScope("dummyScope");
-            pe.setDescription("descr");
-            pe.setDeleted(false);
-            pe.setCreatedBy("Test");
-            commonClassDao.save(pe);
-
-            String dbCheckName = "dummyScope:action";
-            String[] splitDBCheckName = dbCheckName.split(":");
-
-
-            // Current Implementation
-            String query =   "FROM PolicyEntity where policyName like :splitDBCheckName1 and scope = :splitDBCheckName0";
-            SimpleBindings params = new SimpleBindings();
-            params.put("splitDBCheckName1", splitDBCheckName[1] + "%");
-            params.put("splitDBCheckName0", splitDBCheckName[0]);
-            List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
-            // Assertions
-            assertTrue(dataCur.size() == 1);
-            assertTrue(dataCur.get(0) instanceof PolicyEntity);
-            assertEquals(pe, (PolicyEntity) dataCur.get(0));
-
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void getDataByQuery_PolicyController() {
+        // Add data
+        PolicyEntity pe = new PolicyEntity();
+        String name = "actionDummy";
+        pe.setPolicyName(name);
+        pe.setPolicyData("dummyData");
+        pe.prePersist();
+        pe.setScope("dummyScope");
+        pe.setDescription("descr");
+        pe.setDeleted(false);
+        pe.setCreatedBy("Test");
+        commonClassDao.save(pe);
+
+        String dbCheckName = "dummyScope:action";
+        String[] splitDbCheckName = dbCheckName.split(":");
+
+        // Current Implementation
+        String query = "FROM PolicyEntity where policyName like :splitDBCheckName1 and scope = :splitDBCheckName0";
+        SimpleBindings params = new SimpleBindings();
+        params.put("splitDBCheckName1", splitDbCheckName[1] + "%");
+        params.put("splitDBCheckName0", splitDbCheckName[0]);
+        List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
+
+        // Assertions
+        assertTrue(dataCur.size() == 1);
+        assertTrue(dataCur.get(0) instanceof PolicyEntity);
+        assertEquals(pe, dataCur.get(0));

     }
 
     @Test
     @Transactional
     @Rollback(true)
     }
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_PolicyNotificationController(){
-        try{
-            // Add data
-            WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
-            String finalName = "banana"; // Policy File Name
-            String userId = "Test";
-            watch.setLoginIds(userId);
-            watch.setPolicyName(finalName);
-            commonClassDao.save(watch);
-
-
-            // Current Implementation
-            String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
-            SimpleBindings params = new SimpleBindings();
-            params.put("finalName", finalName);
-            params.put("userId", userId);
-            List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
-            // Assertions
-            assertTrue(dataCur.size() == 1);
-            assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
-            assertEquals(watch, (WatchPolicyNotificationTable) dataCur.get(0) );
-
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void getDataByQuery_PolicyNotificationController() {
+        // Add data
+        WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
+        String finalName = "banana"; // Policy File Name
+        String userId = "Test";
+        watch.setLoginIds(userId);
+        watch.setPolicyName(finalName);
+        commonClassDao.save(watch);
+
+
+        // Current Implementation
+        String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
+        SimpleBindings params = new SimpleBindings();
+        params.put("finalName", finalName);
+        params.put("userId", userId);
+        List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
+
+        // Assertions
+        assertTrue(dataCur.size() == 1);
+        assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
+        assertEquals(watch, dataCur.get(0));

     }
 
     }
 

-
-     /* Test for SQL Injection Protection
+    /*
+     * Test for SQL Injection Protection

      */
 
     @Test
     @Transactional
     @Rollback(true)
      */
 
     @Test
     @Transactional
     @Rollback(true)

-    public void getDataByQuery_PolicyNotificationController_Injection(){
-        try{
-            // Add data
-            WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
-            String userId = "Test";
-            watch.setLoginIds(userId);
-            watch.setPolicyName("banana");
-            commonClassDao.save(watch);
-
-            WatchPolicyNotificationTable watch2 = new WatchPolicyNotificationTable();
-            watch2.setLoginIds(userId);
-            watch2.setPolicyName("banana2");
-            commonClassDao.save(watch2);
-
-            // SQL Injection attempt
-            String finalName = "banana' OR '1'='1";
-
-
-            // Current Implementation
-            String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
-            SimpleBindings params = new SimpleBindings();
-            params.put("finalName", finalName);
-            params.put("userId", userId);
-            List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
-            // Assertions
-            assertTrue(dataCur.size() <= 1);
-
-            if(dataCur.size() >= 1){
-                assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
-                assertFalse(watch.equals((WatchPolicyNotificationTable) dataCur.get(0)));
-                assertFalse(watch.equals((WatchPolicyNotificationTable) dataCur.get(0)));
-            }
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
+    public void getDataByQuery_PolicyNotificationController_Injection() {
+        // Add data
+        WatchPolicyNotificationTable watch = new WatchPolicyNotificationTable();
+        String userId = "Test";
+        watch.setLoginIds(userId);
+        watch.setPolicyName("banana");
+        commonClassDao.save(watch);
+
+        WatchPolicyNotificationTable watch2 = new WatchPolicyNotificationTable();
+        watch2.setLoginIds(userId);
+        watch2.setPolicyName("banana2");
+        commonClassDao.save(watch2);
+
+        // SQL Injection attempt
+        String finalName = "banana' OR '1'='1";
+
+
+        // Current Implementation
+        String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
+        SimpleBindings params = new SimpleBindings();
+        params.put("finalName", finalName);
+        params.put("userId", userId);
+        List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
+
+        // Assertions
+        assertTrue(dataCur.size() <= 1);
+
+        if (dataCur.size() >= 1) {
+            assertTrue(dataCur.get(0) instanceof WatchPolicyNotificationTable);
+            assertFalse(watch.equals(dataCur.get(0)));
+            assertFalse(watch.equals(dataCur.get(0)));

         }
     }
 
     @Test
         }
     }
 
     @Test

-    public void testCommonClassDaoImplMethods(){
-        try{
-            UserInfo userInfo = new UserInfo();
-            userInfo.setUserLoginId("TestID");
-            userInfo.setUserName("Test");
-            commonClassDao.save(userInfo);
-            List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
-            assertTrue(data.size() == 1);
-            UserInfo userInfoUpdate = (UserInfo) data.get(0);
-            userInfoUpdate.setUserName("Test1");
-            commonClassDao.update(userInfoUpdate);
-            List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
-            assertTrue(data1.size() == 1);
-            UserInfo data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
-            assertTrue("TestID".equals(data2.getUserLoginId()));
-            List<Object> data3 = commonClassDao.checkDuplicateEntry("TestID:Test1", "userLoginId:userName", UserInfo.class);
-            assertTrue(data3.size() == 1);
-            PolicyRoles roles = new PolicyRoles();
-            roles.setRole("admin");
-            roles.setLoginId(userInfo);
-            roles.setScope("test");
-            commonClassDao.save(roles);
-            List<PolicyRoles> roles1 = commonClassDao.getUserRoles();
-            assertTrue(roles1.size() == 1);
-            List<String> multipleData = new ArrayList<>();
-            multipleData.add("TestID:Test1");
-            List<Object> data4 = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
-            assertTrue(data4.size() == 1);
-            commonClassDao.delete(data2);
-        }catch(Exception e){
-            logger.debug("Exception Occured"+e);
-            fail();
-        }
+    public void testCommonClassDaoImplMethods() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+        UserInfo userInfoUpdate = (UserInfo) data.get(0);
+        userInfoUpdate.setUserName("Test1");
+        commonClassDao.update(userInfoUpdate);
+        List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
+        assertTrue(data1.size() == 1);
+        UserInfo data2 =
+                (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+        assertTrue("TestID".equals(data2.getUserLoginId()));
+        List<Object> data3 = commonClassDao.checkDuplicateEntry("TestID:Test1", "userLoginId:userName", UserInfo.class);
+        assertTrue(data3.size() == 1);
+        PolicyRoles roles = new PolicyRoles();
+        roles.setRole("admin");
+        roles.setLoginId(userInfo);
+        roles.setScope("test");
+        commonClassDao.save(roles);
+        List<PolicyRoles> roles1 = commonClassDao.getUserRoles();
+        assertTrue(roles1.size() == 1);
+        List<String> multipleData = new ArrayList<>();
+        multipleData.add("TestID:Test1");
+        List<Object> data4 =
+                commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+        assertTrue(data4.size() == 1);
+        commonClassDao.delete(data2);

     }
 
     }
 

+    @Test
+    public void testGetDataByIdparameters() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+        data = commonClassDao.getDataById(UserInfo.class, null, null);
+        assertNull(data);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", null);
+        assertNull(data);
+        data = commonClassDao.getDataById(UserInfo.class, null, "TestID:Test");
+        assertNull(data);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginIduserName", "TestID:Test");
+        assertNull(data);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginIduserName", "TestIDTest");
+        assertNull(data);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginId   data2.getUserLoginId()" + ":userName",
+                "TestIDTest");
+        assertNull(data);
+        commonClassDao.delete(data);
+    }
+
+    @Test
+    public void testGetDataByColumnParameters() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<String> data = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
+        assertTrue(data.size() == 1);
+        data = commonClassDao.getDataByColumn(null, null);
+        assertNull(data);
+        data = commonClassDao.getDataByColumn(UserInfo.class, null);
+        assertNull(data);
+        data = commonClassDao.getDataByColumn(null, "userLoginId");
+        assertNull(data);
+        commonClassDao.delete(data);
+    }
+
+    @Test
+    public void testGetMultipleDataOnAddingConjunctionParameters() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<String> multipleData = new ArrayList<>();
+        multipleData.add("TestID:Test1");
+        List<Object> data =
+                commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+        assertTrue(data.size() == 0);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(null, null, null);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(null, null, multipleData);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(null, "userLoginId:userName", null);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(null, "userLoginId:userName", multipleData);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, null, null);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, null, multipleData);
+        assertNull(data);
+        data = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", null);
+        assertNull(data);
+        commonClassDao.delete(data);
+    }
+
+    @Test
+    public void testCheckDuplicateEntryParameters() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<Object> data = commonClassDao.checkDuplicateEntry("TestID:Test1", "userLoginId:userName", UserInfo.class);
+        assertTrue(data.size() == 0);
+        data = commonClassDao.checkDuplicateEntry(null, null, UserInfo.class);
+        assertNull(data);
+        data = commonClassDao.checkDuplicateEntry("userLoginId:userName", null, UserInfo.class);
+        assertNull(data);
+        data = commonClassDao.checkDuplicateEntry(null, "TestID:Test", UserInfo.class);
+        assertNull(data);
+        data = commonClassDao.checkDuplicateEntry("userLoginIduserName", "TestID:Test", UserInfo.class);
+        assertNull(data);
+        data = commonClassDao.checkDuplicateEntry("userLoginId:userName", "TestID:Test:zooby", UserInfo.class);
+        assertNull(data);
+        data = commonClassDao.checkDuplicateEntry("userLoginId:userName", "TestID", UserInfo.class);
+        assertNull(data);
+        commonClassDao.delete(data);
+    }
+
+
+    @Test
+    public void testGetEntityItemParameters() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+        UserInfo userInfoUpdate = (UserInfo) data.get(0);
+        userInfoUpdate.setUserName("Test1");
+        commonClassDao.update(userInfoUpdate);
+        List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
+        assertTrue(data1.size() == 1);
+        UserInfo data2 =
+                (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+        assertTrue("TestID".equals(data2.getUserLoginId()));
+        data2 = (UserInfo) commonClassDao.getEntityItem(null, null, null);
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(null, null, "TestID:Test1");
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(null, "userLoginId:userName", null);
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(null, "userLoginId:userName", "TestID:Test1");
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, null, null);
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, null, "TestID:Test1");
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", null);
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginIduserName", "TestID:Test1");
+        assertNull(data2);
+        data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestIDTest1");
+        assertNull(data2);
+        commonClassDao.delete(data);
+        commonClassDao.delete(data1);
+        commonClassDao.delete(data2);
+    }
+
+    @Test
+    public void testOtherMethods() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        commonClassDao.deleteAll();
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+
+        data = commonClassDao.checkExistingGroupListforUpdate(null, null);
+        assertTrue(data.size() == 0);
+
+        commonClassDao.updateClAlarms(null, null);
+        commonClassDao.updateClYaml(null, null);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+        commonClassDao.update(null);
+        assertTrue(data.size() == 1);
+        commonClassDao.getData(null);
+        assertTrue(data.size() == 1);
+        commonClassDao.delete(data);
+    }
+
+    @Test
+    public void testUpdateQuery() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserLoginId("TestID");
+        userInfo.setUserName("Test");
+        commonClassDao.save(userInfo);
+        commonClassDao.updateQuery("SELECT * FROM userLoginId");
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+
+        String query = "DELETE FROM org.onap.policy.rest.jpa.FunctionDefinition";
+        commonClassDao.updateQuery(query);
+        data = commonClassDao.getDataById(UserInfo.class, "userLoginId:userName", "TestID:Test");
+        assertTrue(data.size() == 1);
+        commonClassDao.delete(data);
+    }
+
+
+    @Test
+    public void testGetDataByQueryParameters() {
+        // Add data
+        UserInfo userinfo = new UserInfo();
+        String loginIdUserName = "Test";
+        userinfo.setUserLoginId(loginIdUserName);
+        userinfo.setUserName(loginIdUserName);
+        commonClassDao.save(userinfo);
+
+        SimpleBindings bindings = new SimpleBindings();
+        bindings.put("usercode", 1L);
+
+        try {
+            commonClassDao.getDataByQuery("from UserInfo", bindings);
+            fail("test should throw an exception here");
+        } catch (Exception exc) {
+            assertTrue(exc.getMessage().contains("Parameter usercode does not exist as a named parameter"));
+        }
+    }

 
     private void truncateAllTables() {
         Session session = sessionFactory.openSession();
 
     private void truncateAllTables() {
         Session session = sessionFactory.openSession();


@@ -456,5 +618,4 @@ public class PolicyValidationDaoImplTest {
         transaction.commit();
         session.close();
     }
         transaction.commit();
         session.close();
     }

-

 }
 }