Reduce technical debt

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / PolicyNotificationMail.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
index a4e4762..895adbe 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java
@@ -108,12 +108,15 @@ public class PolicyNotificationMail{
                }
                String policyFileName = entityItem.getPolicyName();
                String checkPolicyName = policyName;
+               if(checkPolicyName.endsWith(".xml") || checkPolicyName.contains(".")){
+                       checkPolicyName = checkPolicyName.substring(0, checkPolicyName.indexOf('.'));
+               }
                if(policyFileName.contains("/")){
-                       policyFileName = policyFileName.substring(0, policyFileName.indexOf("/"));
+                       policyFileName = policyFileName.substring(0, policyFileName.indexOf('/'));
                        policyFileName = policyFileName.replace("/", File.separator);
                }
                if(policyFileName.contains("\\")){
-                       policyFileName = policyFileName.substring(0, policyFileName.indexOf("\\"));
+                       policyFileName = policyFileName.substring(0, policyFileName.indexOf('\\'));
                        policyFileName = policyFileName.replace("\\", "\\\\");
                }
                
@@ -122,7 +125,12 @@ public class PolicyNotificationMail{
                boolean sendFlag = false;
                SimpleBindings params = new SimpleBindings();
                params.put("policyFileName", policyFileName);
-               List<Object> watchList = policyNotificationDao.getDataByQuery(query, params);
+               List<Object> watchList = null;
+               if(PolicyController.isjUnit()){
+                       watchList = policyNotificationDao.getDataByQuery(query, null);
+               }else{
+                       watchList = policyNotificationDao.getDataByQuery(query, params);
+               }
                if(watchList != null && !watchList.isEmpty()){
                        for(Object watch : watchList){
                                WatchPolicyNotificationTable list = (WatchPolicyNotificationTable) watch;
@@ -135,11 +143,9 @@ public class PolicyNotificationMail{
                                        }
                                }
                                if(sendFlag){
-                                       AnnotationConfigApplicationContext ctx = null;
-                                       try {
+                                       try (AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext()) {
                                                to = list.getLoginIds()+"@"+PolicyController.getSmtpEmailExtension();
                                                to = to.trim();
-                                               ctx = new AnnotationConfigApplicationContext();
                                                ctx.register(PolicyNotificationMail.class);
                                                ctx.refresh();
                                                JavaMailSenderImpl mailSender = ctx.getBean(JavaMailSenderImpl.class);
@@ -150,15 +156,11 @@ public class PolicyNotificationMail{
                                                mailMsg.setSubject(subject);
                                                mailMsg.setText(message);
                                                mailSender.send(mimeMessage);
-                                               if(mode.equalsIgnoreCase("Rename") || mode.contains("Delete") || mode.contains("Move")){
+                                               if("Rename".equalsIgnoreCase(mode) || mode.contains("Delete") || mode.contains("Move")){
                                                        policyNotificationDao.delete(watch);
                                                }
                                        } catch (Exception e) {
                                                policyLogger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW+"Exception Occured in Policy Notification" +e);
-                                       }finally{
-                                               if(ctx != null){
-                                                       ctx.close();
-                                               }
                                        }
                                }
                        }