Modified the code to fix various pushPolicy issuesv1.1.2

 - Added modifications per Pam's review

Change-Id: I5d67ee529cbc5245e7d1f8dbec6f2f2d453ce299
Issue-ID: POLICY-486
Signed-off-by: Michael Mokry <mm117s@att.com>
(cherry picked from commit b6bae924c4a794cd772ac1524089fc8739e310b1)

1 files changed, 9 insertions, 0 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index 64324d432..2af8a6ee1 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -193,6 +193,15 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					return new ResponseEntity<String>(body, status);
 				}		
 			}else{
+				// if policy does not exist and the request is updatePolicy return error
+				if(policyData.isEditPolicy()){
+					body = "policyNotAvailableForEdit";
+					status = HttpStatus.NOT_FOUND;
+					response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+					response.addHeader("error", body);
+					response.addHeader("message", policyData.getPolicyName() + " does not exist on the PAP and cannot be updated.");
+					return new ResponseEntity<String>(body, status);
+				}
 				version = 1;
 				if(userId == null){
 					createdBy = "API";