improve sonar coverage for uui-server

Change-Id: Ia0548cee21670d1209561729240bee1efce70b67
Issue-ID: USECASEUI-103
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
index 3b75145..5f249ad 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
@@ -1,4 +1,4 @@
-/*\r
+/**\r
  * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
@@ -15,8 +15,6 @@
  */\r
 package org.onap.usecaseui.server.service.impl;\r
 \r
-\r
-\r
 import java.util.Date;\r
 import java.sql.Timestamp;\r
 import java.util.ArrayList;\r
@@ -35,80 +33,51 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;\r
 import org.springframework.stereotype.Service;\r
 \r
-\r
 @Service("AlarmsHeaderService")\r
 @Transactional\r
 @org.springframework.context.annotation.Configuration\r
 @EnableAspectJAutoProxy\r
 public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {\r
-       \r
     private static final Logger logger = LoggerFactory.getLogger(AlarmsHeaderServiceImpl.class);\r
 \r
     @Autowired\r
     private SessionFactory sessionFactory;\r
-    \r
+\r
        private Session getSession() {\r
                return sessionFactory.openSession();\r
        }\r
-    \r
-       public String saveAlarmsHeader(AlarmsHeader alarmsHeader) {\r
-                try(Session session = getSession()){\r
-                   if (null == alarmsHeader) {\r
-                       logger.error("AlarmsHeaderServiceImpl saveAlarmsHeader alarmsHeader is null!");\r
-                   }\r
-                   logger.info("AlarmsHeaderServiceImpl saveAlarmsHeader: alarmsHeader={}", alarmsHeader);\r
-                   Transaction tx = session.beginTransaction();     \r
-                   session.save(alarmsHeader);\r
-                   tx.commit();\r
-                   session.flush();\r
-                   return "1";\r
-               } catch (Exception e) {\r
-                   logger.error("exception occurred while performing AlarmsHeaderServiceImpl saveAlarmsHeader. Details:" + e.getMessage());\r
-                   return "0";\r
-               }\r
-               \r
-       }\r
-\r
-       /*@Override\r
-       public String updateAlarmsHeader2018(String status, String date,String eventNameCleared,String eventName, String reportingEntityName,String specificProblem) {\r
 \r
-               try(Session session = sessionFactory.getCurrentSession();){\r
-\r
-                       logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
-                       session.beginTransaction();\r
-                       Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"' ");\r
-            q.executeUpdate();\r
-                       session.getTransaction().commit();\r
+       public String saveAlarmsHeader(AlarmsHeader alarmsHeader) {\r
+               try(Session session = getSession()){\r
+                       if (null == alarmsHeader) {\r
+                               logger.error("AlarmsHeaderServiceImpl saveAlarmsHeader alarmsHeader is null!");\r
+                       }\r
+                       logger.info("AlarmsHeaderServiceImpl saveAlarmsHeader: alarmsHeader={}", alarmsHeader);\r
+                       Transaction tx = session.beginTransaction();     \r
+                       session.save(alarmsHeader);\r
+                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r
-                       logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
+                       logger.error("exception occurred while performing AlarmsHeaderServiceImpl saveAlarmsHeader. Details:" + e.getMessage());\r
                        return "0";\r
                }\r
-       }*/\r
-\r
+       }\r
 \r
        @Override\r
        public String updateAlarmsHeader2018(String status, Timestamp date, String startEpochMicrosecCleared, String lastEpochMicroSecCleared, String eventName, String reportingEntityName, String specificProblem) {\r
-\r
-               try(Session session = sessionFactory.openSession();){\r
-                       //try(Session session = sessionFactory.getCurrentSession();){\r
+               try(Session session = getSession()){\r
                        logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
                        session.beginTransaction();\r
 \r
-                       //Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' , startEpochMicrosecCleared='"+startEpochMicrosecCleared+"'  ,lastEpochMicroSecCleared='"+lastEpochMicroSecCleared+"'    where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"'");\r
             Query q=session.createQuery("update AlarmsHeader set status=:status, updateTime=:date, startEpochMicrosecCleared=:startEpochMicrosecCleared  ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared    where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");\r
-\r
             q.setString("status",status);\r
             q.setDate("date",date);\r
-\r
             q.setString("startEpochMicrosecCleared",startEpochMicrosecCleared);\r
             q.setString("lastEpochMicroSecCleared",lastEpochMicroSecCleared);\r
             q.setString("eventName",eventName);\r
             q.setString("reportingEntityName",reportingEntityName);\r
             q.setString("specificProblem",specificProblem);\r
-\r
-\r
             q.executeUpdate();\r
                        session.getTransaction().commit();\r
                        session.flush();\r
@@ -121,13 +90,10 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 \r
        @Override\r
        public Boolean getStatusBySourceName(String sourceName) {\r
-               try(Session session = sessionFactory.openSession()){\r
+               try(Session session = getSession()){\r
                        logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
-                       //Transaction tx = session.beginTransaction();\r
-                       //session.beginTransaction();\r
                        Query q=session.createQuery("select status from AlarmsHeader where sourceName='"+sourceName+"' and status='active'");\r
                        q.setMaxResults(1);\r
-                       //tx.commit();\r
                        String s=(String)q.uniqueResult();\r
                        Boolean status=false;\r
                        if(s!=null && "active".equals(s)){\r
@@ -137,47 +103,32 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        }\r
                        session.flush();\r
                        return status;\r
-                       //return "1";\r
                } catch (Exception e) {\r
                        logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
                        return false;\r
                }\r
-               //return null;\r
        }\r
 \r
 \r
        @Override\r
        public AlarmsHeader getIdByStatusSourceName(String sourceName) {\r
-               //List<AlarmsHeader>  list = new ArrayList<>();\r
                AlarmsHeader s = new AlarmsHeader();\r
-               try(Session session = sessionFactory.openSession()){\r
+               try(Session session = getSession()){\r
                        logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
-                       //Transaction tx = session.beginTransaction();\r
-                       //session.beginTransaction();\r
-                       //Query q=session.createQuery("select sourceName,createTime from AlarmsHeader where sourceName='"+sourceName+"' and status='active' order by createTime desc");\r
                        Query q=session.createQuery("from AlarmsHeader where sourceName='"+sourceName+"' and status='active' order by createTime desc");\r
-\r
-                       //q.setString(1,sourceName);\r
                        q.setMaxResults(1);\r
-                       //tx.commit();\r
-                       //String s=(String)q.uniqueResult();\r
                        s = (AlarmsHeader)q.uniqueResult();\r
-                       // list= q.list();\r
-\r
                        session.flush();\r
                        return s;\r
-                       //return "1";\r
                } catch (Exception e) {\r
                        logger.error("exception occurred while performing AlarmsInformationServiceImpl updateAlarmsInformation. Details:" + e.getMessage());\r
                        return s;\r
                }\r
-               //return null;\r
        }\r
 \r
-\r
        @Override\r
        public String updateAlarmsHeader(AlarmsHeader alarmsHeader) {\r
-               try(Session session = sessionFactory.openSession();){\r
+               try(Session session = getSession()){\r
             if (null == alarmsHeader){\r
                 logger.error("AlarmsHeaderServiceImpl updateAlarmsHeader alarmsHeader is null!");\r
             }\r
@@ -193,21 +144,16 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
         }\r
        }\r
 \r
-\r
-\r
-\r
-\r
        @Override\r
        public int getAllCountByStatus(String status){\r
-               try (Session session = sessionFactory.openSession()){\r
+               try (Session session = getSession()){\r
                        StringBuffer count = new StringBuffer("select count(*) from AlarmsHeader a where 1=1");\r
                if(!"0".equals(status)){\r
                        count.append(" and a.status=:status");\r
                }\r
                Query  query =session.createQuery(count.toString());\r
                query.setString("status",status);\r
-               //int q = (int)query.uniqueResult();\r
-                       long q=(long)query.uniqueResult();\r
+               long q=(long)query.uniqueResult();\r
                session.flush();\r
                return (int)q;\r
                }catch (Exception e){\r
@@ -218,7 +164,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 \r
        @Override\r
        public List<AlarmsHeader> getAllByStatus(String status,String eventName,String sourceName,String eventServerity,String reportingEntityName,  Date createTime, Date endTime){\r
-               try (Session session = sessionFactory.openSession()){\r
+               try (Session session = getSession()){\r
                        StringBuffer string = new StringBuffer("from AlarmsHeader a where 1=1");\r
                        if(!"0".equals(status)){\r
                                string.append(" and a.status=:status");\r
@@ -247,33 +193,24 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        if( null!=createTime && endTime!= null) {\r
                                query.setDate("startTime",createTime);\r
                                query.setDate("endTime",endTime);\r
-\r
                        }\r
                        List<AlarmsHeader> list =query.list();\r
-\r
                        return list;\r
-\r
                }catch (Exception e){\r
-\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
                        return null;\r
                }\r
-\r
-\r
-\r
        }\r
 \r
        @Override\r
        public AlarmsHeader getAlarmsHeaderDetail(Integer id) {\r
-               try(Session session = sessionFactory.openSession()) {\r
-\r
+               try(Session session = getSession()) {\r
                        String string = "from AlarmsHeader a where 1=1 and a.id=:id";\r
                        Query q = session.createQuery(string);\r
                        q.setInteger("id",id);\r
                        AlarmsHeader alarmsHeader =(AlarmsHeader)q.uniqueResult();\r
                        session.flush();\r
                        return alarmsHeader;\r
-\r
                }catch (Exception e){\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAlarmsHeaderDetail."+e.getMessage());\r
                        return null;\r
@@ -282,7 +219,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 \r
        @Override\r
        public int getAllByDatetime(String status,String eventId, String eventServrity, String createTime) {\r
-               try (Session session = sessionFactory.openSession();){\r
+               try (Session session = getSession()){\r
                        StringBuffer string = new StringBuffer("select count(*) as count from AlarmsHeader a where 1=1");\r
 \r
                        if(!"0".equals(status) &&  status!=null){\r
@@ -291,50 +228,33 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        if(!"0".equals(eventId) &&  eventId!=null){\r
                                string.append(" and a.eventId=:eventId");\r
                        }\r
-\r
                        if(!"0".equals(eventServrity) &&  eventServrity!=null){\r
                                string.append(" and a.eventServrity=:eventServrity");\r
                        }\r
-\r
-                       /*if( null!=createTime && endTime!= null) {\r
-                               string.append(" and a.createTime between :startTime and :endTime");\r
-                       }*/\r
                        if( null!=createTime) {\r
                                string.append(" and to_days(a.createTime) = to_days('"+createTime+"')");\r
                        }\r
 \r
-                       /*string.append("     group by DATE_FORMAT(a.createTime,'%y-%m-%d')");*/\r
                        Query query = session.createQuery(string.toString());\r
                        query.setString("status",status);\r
                        query.setString("eventId",eventId);\r
                        query.setString("eventServrity",eventServrity);\r
-                       //query.setDate("createTime",createTime);\r
 \r
-                       /*if( null!=createTime && endTime!= null) {\r
-                               query.setDate("startTime",createTime);\r
-                               query.setDate("endTime",endTime);\r
-\r
-                       }*/\r
                        long l = (long)query.uniqueResult();\r
                        int a = (int) l;\r
-                       //List<AlarmsHeader> list =query.list();\r
                        session.flush();\r
                        return a;\r
-\r
                }catch (Exception e){\r
-\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
                        return 0;\r
                }\r
-\r
        }\r
 \r
-\r
        public int getAllCount(AlarmsHeader alarmsHeader,int currentPage,int pageSize) {\r
-               try(Session session = sessionFactory.openSession()){\r
+               try(Session session = getSession()){\r
                        StringBuffer count=new StringBuffer("select count(*) from AlarmsHeader a where 1=1");\r
                        if (null == alarmsHeader) {\r
-                //logger.error("AlarmsHeaderServiceImpl getAllCount alarmsHeader is null!");\r
+                logger.error("AlarmsHeaderServiceImpl getAllCount alarmsHeader is null!");\r
             }else {\r
                if(null!=alarmsHeader.getVersion()) {\r
                        String ver=alarmsHeader.getVersion();\r
@@ -420,10 +340,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        String ver =alarmsHeader.getSpecificProblem();\r
                        count.append(" and a.specificProblem like '%"+ver+"%'");\r
                 }\r
-               /*if(null!=alarmsHeader.getVfStatus()) {\r
-                       String ver =alarmsHeader.getVfStatus();\r
-                       count.append(" and a.vfStatus = '"+ver+"'");\r
-                }*/\r
                if(null!=alarmsHeader.getAlarmInterfaceA()) {\r
                        String ver =alarmsHeader.getAlarmInterfaceA();\r
                        count.append(" and a.alarmInterfaceA like '%"+ver+"%'");\r
@@ -436,7 +352,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                                        count.append(" and a.createTime between :startTime and :endTime");\r
                                }\r
             }\r
-            //count.append(" and a.status != 3");\r
             Query query = session.createQuery(count.toString());\r
                        if (null != alarmsHeader)\r
                 if(null!=alarmsHeader.getCreateTime() || alarmsHeader.getUpdateTime()!= null) {\r
@@ -452,17 +367,16 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
         }\r
        }\r
 \r
-       //@SuppressWarnings("unchecked")\r
        @Override\r
        public Page<AlarmsHeader> queryAlarmsHeader(AlarmsHeader alarmsHeader,int currentPage,int pageSize) {\r
                Page<AlarmsHeader> page = new Page<AlarmsHeader>();\r
                int allRow =this.getAllCount(alarmsHeader,currentPage,pageSize);\r
                int offset = page.countOffset(currentPage, pageSize);\r
-               \r
-               try(Session session = sessionFactory.openSession();){\r
+\r
+               try(Session session = getSession()){\r
                        StringBuffer hql =new StringBuffer("from AlarmsHeader a where 1=1");\r
             if (null == alarmsHeader) {\r
-                //logger.error("AlarmsHeaderServiceImpl queryAlarmsHeader alarmsHeader is null!");\r
+                logger.error("AlarmsHeaderServiceImpl queryAlarmsHeader alarmsHeader is null!");\r
             }else {\r
                if(null!=alarmsHeader.getVersion()) {\r
                        String ver=alarmsHeader.getVersion();\r
@@ -548,10 +462,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        String ver =alarmsHeader.getSpecificProblem();\r
                        hql.append(" and a.specificProblem like '%"+ver+"%'");\r
                 }\r
-               /*if(null!=alarmsHeader.getVfStatus()) {\r
-                       String ver =alarmsHeader.getVfStatus();\r
-                       hql.append(" and a.vfStatus = '"+ver+"'");\r
-                }*/\r
                if(null!=alarmsHeader.getAlarmInterfaceA()) {\r
                        String ver =alarmsHeader.getAlarmInterfaceA();\r
                        hql.append(" and a.alarmInterfaceA like '%"+ver+"%'");\r
@@ -564,7 +474,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        hql.append(" and a.createTime between :startTime and :endTime");\r
                 }\r
             }\r
-            //hql.append(" and a.status != 3");\r
             logger.info("AlarmsHeaderServiceImpl queryAlarmsHeader: alarmsHeader={}", alarmsHeader);\r
             Query query = session.createQuery(hql.toString());\r
                        if (null != alarmsHeader)\r
@@ -579,7 +488,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
             page.setPageSize(pageSize);\r
             page.setTotalRecords(allRow);\r
             page.setList(list);\r
-\r
             session.flush();\r
             return page;\r
         } catch (Exception e) {\r
@@ -588,11 +496,10 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
         }\r
        }\r
 \r
-       \r
        @SuppressWarnings("unchecked")\r
        @Override\r
        public List<AlarmsHeader> queryId(String[] id) {\r
-               try(Session session = sessionFactory.openSession()){\r
+               try(Session session = getSession()){\r
                        if(id.length==0) {\r
                                logger.error("AlarmsHeaderServiceImpl queryId is null!");\r
                        }\r
@@ -606,15 +513,12 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                }\r
        }\r
 \r
-\r
     @Override\r
     public String queryStatusCount(String status) {\r
-        try(Session session = sessionFactory.openSession()){\r
+        try(Session session = getSession()){\r
             String hql = "select count(status) from AlarmsHeader a";\r
             if (!status.equals("0"))\r
                 hql+=" where a.status = :status";\r
-           // else\r
-             //   hql+=" where a.status != 3";\r
             Query query = session.createQuery(hql);\r
             if (!status.equals("0"))\r
                 query.setString("status",status);\r

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
index 3d1c37a..f7be8c0 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
@@ -55,65 +55,23 @@ public class AlarmsHeaderServiceImplTest {
        public void after() throws Exception { 
        }
 
+       AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
        private Session session;
        private Transaction transaction;
        private Query query;
 
-       /** 
-       * 
-       * Method: saveAlarmsHeader(AlarmsHeader alarmsHeader) 
-       * 
-       */ 
        @Test
        public void testSaveAlarmsHeader() throws Exception { 
-       //TODO: Test goes here...
-               AlarmsHeader a = new AlarmsHeader();
-               a.setEventName("a");
-               a.setStatus("1");
-               a.setVfStatus("1");
-               a.setEventId("1119");
-               a.setDomain("asb");
-               a.setEventCategory("s");
-               a.setAlarmCondition("ea");
-               a.setAlarmInterfaceA("cs");
-               a.setCreateTime(DateUtils.now());
-               a.setEventServrity("s");
-               a.setEventSourceType("q");
-               a.setEventType("q");
-               a.setFaultFieldsVersion("v1");
-               a.setLastEpochMicroSec("csa");
-               a.setNfcNamingCode("std");
-               a.setNfNamingCode("cout");
-               a.setPriority("cs");
-               a.setReportingEntityId("112");
-               a.setReportingEntityName("asfs");
-               a.setSequence("cgg");
-               a.setSourceId("123");
-               a.setSourceName("eggs");
-               a.setSpecificProblem("especially");
-               a.setStartEpochMicrosec("wallet");
-               a.setUpdateTime(DateUtils.now());
-               a.setVersion("va2");
-
-               
-               
-               
-        MockUp<Query> mockUpQuery = new MockUp<Query>() {
-        };
                MockUp<Session> mockedSession = new MockUp<Session>() {
-            @Mock
-            public Query createQuery(String sql) {
-                return mockUpQuery.getMockInstance();
-            }
                        @Mock
                        public Transaction beginTransaction() {
                                return transaction;
                        }
-               };
-               new MockUp<SessionFactory>() {
                        @Mock
-                       public Session openSession() {
-                               return mockedSession.getMockInstance();
+                       public void save(AlarmsHeader alarmsHeader) {
+                       }
+                       @Mock
+                       public void flush() {
                        }
                };
                new MockUp<Transaction>() {
@@ -121,20 +79,20 @@ public class AlarmsHeaderServiceImplTest {
                        public void commit() {
                        }
                };
-        new MockUp<AlarmsHeaderServiceImpl>() {
-            @Mock
-            private Session getSession() {
-                return mockedSession.getMockInstance();
-            }
-        };
-
-               AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
-               alarmsHeaderServiceImpl.saveAlarmsHeader(a);
-       } 
-
-
-
+               new MockUp<AlarmsHeaderServiceImpl>() {
+                       @Mock
+                       private Session getSession() {
+                               return mockedSession.getMockInstance();
+                       }
+               };
+               AlarmsHeader alarmsHeader = null;
+               alarmsHeaderServiceImpl.saveAlarmsHeader(alarmsHeader);
+       }
 
+       @Test(expected = Exception.class)
+       public void testSaveAlarmsHeaderError(){
+               alarmsHeaderServiceImpl.saveAlarmsHeader(new AlarmsHeader());
+       }
 
 
 }