Merge "Resolved the Policy Removal issue from PDP"

diff --combined ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 8b4651f,d1aef14..a8449e3
--- 1/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
--- 2/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@@ -127,7 -127,7 +127,7 @@@ public class PolicyDBDao 
        public static final String duplicatePolicyId = "Somehow, more than one policy with the id ";
        public static final String foundInDB = " were found in the database";
        
 -      public static boolean isJunit = false;
 +      private static boolean isJunit = false;
  
        public static void setJunit(boolean isJunit) {
                PolicyDBDao.isJunit = isJunit;
@@@ -1250,9 -1250,6 +1250,9 @@@
                                        for(PDPPolicy policy : policies){
                                                try{
                                                        String[] stringArray = getNameScopeAndVersionFromPdpPolicy(policy.getId());
 +                                                      if(stringArray == null) {
 +                                                          throw new IllegalArgumentException("Invalid input - policyID must contain name, scope and version");
 +                                                      }
                                                        List<PolicyEntity> policyEntityList;
                                                        Query getPolicyEntitiesQuery = em.createNamedQuery("PolicyEntity.findByNameAndScope");
                                                        getPolicyEntitiesQuery.setParameter("name", stringArray[0]);
@@@ -1770,7 -1767,7 +1770,7 @@@
                                        policyId = policyName;
                                        policyQuery = em.createQuery("SELECT p FROM PolicyEntity p WHERE p.policyName=:name AND p.scope=:scope");
                                        policyQuery.setParameter("name", policyId);
-                                       policyQuery.setParameter(scope, scope);
+                                       policyQuery.setParameter("scope", scope);
                                } else{
                                        policyId = String.valueOf(policyID);
                                        policyQuery = em.createNamedQuery("PolicyEntity.FindById");