[Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes

Change-Id: I5675cf4527e17963b3142cf7184c0df31a766197
Signed-off-by: Tarun Tej Velaga <tt3868@att.com>

9 files changed, 30 insertions, 2 deletions

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
index 65f0ede26..3ddeee32e 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
@@ -22,6 +22,7 @@ package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -170,6 +171,7 @@ public class ActionPolicyDictionaryController {
 			}else{
 				if(!isFakeUpdate) {
 					actionPolicyDict.setUserModifiedBy(this.getUserInfo(userId));
+					actionPolicyDict.setModifiedDate(new Date());
 					commonClassDao.update(actionPolicyDict); 
 				}
 			} 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
index eb03aa996..4dda095d4 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
@@ -23,6 +23,7 @@ package org.openecomp.policy.pap.xacml.rest.controller;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -324,6 +325,7 @@ public class BRMSDictionaryController{
                         }
                     }else{
                         brmsDependency.setUserModifiedBy(this.getUserInfo(userId));
+                        brmsDependency.setModifiedDate(new Date());
                         commonClassDao.update(brmsDependency); 
                     }
                     if(duplicateflag) {
@@ -476,6 +478,7 @@ public class BRMSDictionaryController{
                         }
                     }else{
                         brmsController.setUserModifiedBy(this.getUserInfo(userId));
+                        brmsController.setModifiedDate(new Date());
                         commonClassDao.update(brmsController); 
                     }
                     if(duplicateflag) {
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
index 9aab267d6..f97d84692 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
@@ -21,6 +21,7 @@
 package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -325,6 +326,7 @@ public class ClosedLoopDictionaryController{
 				}else{
 					vSCLAction.setUserCreatedBy(this.getUserInfo(userId));
 					vSCLAction.setUserModifiedBy(this.getUserInfo(userId));
+					vSCLAction.setModifiedDate(new Date());
 					commonClassDao.save(vSCLAction);
 				}
 			}else{
@@ -453,6 +455,7 @@ public class ClosedLoopDictionaryController{
 			}else{
 				if(!isFakeUpdate) {
 					vNFType.setUserModifiedBy(this.getUserInfo(userId));
+					vNFType.setModifiedDate(new Date());
 					commonClassDao.update(vNFType); 
 				}
 			} 
@@ -592,6 +595,7 @@ public class ClosedLoopDictionaryController{
 			}else{
 				if(!isFakeUpdate){
 					pEPOptions.setUserModifiedBy(this.getUserInfo(userId));
+					pEPOptions.setModifiedDate(new Date());
 					commonClassDao.update(pEPOptions);
 				}
 			}
@@ -712,6 +716,7 @@ public class ClosedLoopDictionaryController{
 			}else{
 				if(!isFakeUpdate){
 					serviceData.setUserModifiedBy(this.getUserInfo(userId));
+					serviceData.setModifiedDate(new Date());
 					commonClassDao.update(serviceData); 
 				}
 			}
@@ -830,6 +835,7 @@ public class ClosedLoopDictionaryController{
 			}else{
 				if(!isFakeUpdate) {
 					siteData.setUserModifiedBy(this.getUserInfo(userId));
+					siteData.setModifiedDate(new Date());
 					commonClassDao.update(siteData);
 				}
 			}
@@ -949,6 +955,7 @@ public class ClosedLoopDictionaryController{
 			}else{
 				if(!isFakeUpdate){
 					varbindDictionary.setUserModifiedBy(this.getUserInfo(userId));
+					varbindDictionary.setModifiedDate(new Date());
 					commonClassDao.update(varbindDictionary);
 				}
 			}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
index fc525bbe3..c9a20066d 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
@@ -22,6 +22,7 @@ package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -169,6 +170,7 @@ public class DecisionPolicyDictionaryController {
 			}else{
 				if(!isFakeUpdate) {
 					decisionSettings.setUserModifiedBy(this.getUserInfo(userId));
+					decisionSettings.setModifiedDate(new Date());
 					commonClassDao.update(decisionSettings); 
 				}
 			}
@@ -248,7 +250,7 @@ public class DecisionPolicyDictionaryController {
 		try{
 			Map<String, Object> model = new HashMap<>();
 			ObjectMapper mapper = new ObjectMapper();
-			model.put("rainyDayDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(RainyDayTreatments.class, "bbID")));
+			model.put("rainyDayDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(RainyDayTreatments.class, "bbid")));
 			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
 			JSONObject j = new JSONObject(msg);
 			response.getWriter().write(j.toString());
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
index a64cdf77e..0ea1da171 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
@@ -21,6 +21,7 @@
 package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -169,6 +170,7 @@ public class DescriptiveDictionaryController {
 			}else{
 				if(!isFakeUpdate){
 					descriptiveScope.setUserModifiedBy(this.getUserInfo(userId));
+					descriptiveScope.setModifiedDate(new Date());
 					commonClassDao.update(descriptiveScope); 
 				}
 			} 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
index 49d841a6e..b01f9b031 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
@@ -22,6 +22,7 @@ package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -204,6 +205,7 @@ public class DictionaryController {
 			}else{
 				if(!isFakeUpdate) {
 					attributeData.setUserModifiedBy(this.getUserInfo(userId));
+					attributeData.setModifiedDate(new Date());
 					commonClassDao.update(attributeData); 
 				}
 			} 
@@ -357,6 +359,7 @@ public class DictionaryController {
 			}else{
 				if(!isFakeUpdate){
 					ecompData.setUserModifiedBy(this.getUserInfo(userId));
+					ecompData.setModifiedDate(new Date());
 					commonClassDao.update(ecompData);
 				}
 			} 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
index 6c9d713ef..5172f451b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
@@ -23,6 +23,7 @@ package org.openecomp.policy.pap.xacml.rest.controller;
 import java.io.PrintWriter;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -1969,6 +1970,7 @@ public class FirewallDictionaryController {
 				}
 			}else{
 				fwTagPicker.setUserModifiedBy(this.getUserInfo(userId));
+				fwTagPicker.setModifiedDate(new Date());
 				commonClassDao.update(fwTagPicker); 
 			} 
 
@@ -2130,6 +2132,7 @@ public class FirewallDictionaryController {
 				}   
 			}else{
 				fwTag.setUserModifiedBy(this.getUserInfo(userId));
+				fwTag.setModifiedDate(new Date());
 				commonClassDao.update(fwTag); 
 			} 
 
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
index ecf84620e..b933a4f84 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
@@ -62,7 +62,11 @@ public class MicroServiceDictionaryController {
 	private static final Logger LOGGER  = FlexLogger.getLogger(MicroServiceDictionaryController.class);
 
 	private static CommonClassDao commonClassDao;
-	
+
+	public static void setCommonClassDao(CommonClassDao commonClassDao) {
+		MicroServiceDictionaryController.commonClassDao = commonClassDao;
+	}
+
 	@Autowired
 	public MicroServiceDictionaryController(CommonClassDao commonClassDao){
 		MicroServiceDictionaryController.commonClassDao = commonClassDao;
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
index 42dfb88fe..8c88e68be 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
@@ -21,6 +21,7 @@
 package org.openecomp.policy.pap.xacml.rest.controller;
 
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -155,6 +156,7 @@ public class SafePolicyController {
 			} else {
 				if (!isFakeUpdate) {
 					riskTypeData.setUserModifiedBy(this.getUserInfo(userId));
+					riskTypeData.setModifiedDate(new Date());
 					commonClassDao.update(riskTypeData);
 				}
 			}