X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Felk%2Fclient%2FPolicyElasticSearchController.java;h=77e45e30df3ddcaa14ae7be39e15c783aab0a483;hb=1a32a85b3307b11fba07bc6f2ac3fe6d2c0028d0;hp=e9c4af27ebaabd8b6dbbd3550c604644b4c6cd99;hpb=7925630b5edc79119f29392edc6ddc84cf7c3757;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
index e9c4af27e..77e45e30d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
@@ -97,7 +97,7 @@ public class PolicyElasticSearchController{
 		private static final long serialVersionUID = 1L;
 	};
 	
-	public static CommonClassDao commonClassDao;
+	private static CommonClassDao commonClassDao;
 
 	@Autowired
 	public PolicyElasticSearchController(CommonClassDao commonClassDao) {
@@ -231,7 +231,7 @@ public class PolicyElasticSearchController{
 								if(searchData.getPolicyType() != null && "closedLoop".equals(searchData.getPolicyType())){
 									searchKeyValue.put("jsonBodyData", "*" +entry[1] +"*");
 								}else{
-									searchKeyValue.put(entry[0], entry[1]);
+									searchText = entry[1];
 								}
 							}
 						}
@@ -265,13 +265,13 @@ public class PolicyElasticSearchController{
 						searchKeyValue.put("jsonBodyData."+d2Service+"", "true");
 					}	
 					if(searchData.getVnfType() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getVnfType() +"*");					
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getVnfType()+"*");					
 					}
 					if(searchData.getPolicyStatus() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getPolicyStatus()+"*");
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getPolicyStatus()+"*");
 					}
 					if(searchData.getVproAction() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getVproAction()+"*");
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getVproAction()+"*");
 					}
 					if(searchData.getServiceType() != null){
 						searchKeyValue.put("serviceType", searchData.getServiceType());
@@ -288,8 +288,10 @@ public class PolicyElasticSearchController{
 							type = ElkConnector.PolicyIndexType.decision;
 						}else if(policyType.equalsIgnoreCase("config")){
 							type = ElkConnector.PolicyIndexType.config;
-						}else {
+						}else if(policyType.equalsIgnoreCase("closedloop")){
 							type = ElkConnector.PolicyIndexType.closedloop;
+						}else{
+							type = ElkConnector.PolicyIndexType.all;
 						}
 					}else{
 						type = ElkConnector.PolicyIndexType.all;
@@ -388,17 +390,17 @@ public class PolicyElasticSearchController{
 			case clVarbind :
 				VarbindDictionary varbindDictionary = (VarbindDictionary)mapper.readValue(root.get("data").toString(), VarbindDictionary.class);
 				value = varbindDictionary.getVarbindName();
-				policyList = searchElkDatabase(closedloop, "jsonBodyData.triggerSignaturesUsedForUI.signatures",value);
+				policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
 				break;
 			case clVnf :
 				VNFType vNFType = (VNFType)mapper.readValue(root.get("data").toString(), VNFType.class);
 				value = vNFType.getVnftype();
-				policyList = searchElkDatabase(closedloop, "jsonBodyData.vnfType",value);
+				policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
 				break;
 			case clVSCL :
 				VSCLAction vsclAction = (VSCLAction)mapper.readValue(root.get("data").toString(), VSCLAction.class);
 				value = vsclAction.getVsclaction();
-				policyList = searchElkDatabase(closedloop, "jsonBodyData.actions",value);
+				policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
 				break;
 			case decision :
 				DecisionSettings decisionSettings = (DecisionSettings)mapper.readValue(root.get("data").toString(), DecisionSettings.class);