X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FPolicyValidationController.java;h=05264c8b61ad5dade7d10683646415cf9b874ece;hp=ed32f290483c7053ce73ddecafbf9de19f25fdbe;hb=1e61676b77dd09659027b8984f050df7e8538526;hpb=e688c3ab14a546dcc7acc189007ac4d42e349332

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java
index ed32f2904..05264c8b6 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,9 +20,9 @@
 
 package org.onap.policy.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,46 +33,49 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.util.PolicyValidation;
 import org.onap.policy.rest.util.PolicyValidationRequestWrapper;
+import org.onap.policy.utils.PolicyUtils;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.web.support.JsonMessage;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @Controller
 @RequestMapping("/")
 public class PolicyValidationController extends RestrictedBaseController {
 
-	private static final Logger LOGGER	= FlexLogger.getLogger(PolicyValidationController.class);
+    private static final Logger LOGGER = FlexLogger.getLogger(PolicyValidationController.class);
+
+    /**
+     * validatePolicy.
+     *
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     * @return ModelAndView
+     * @throws IOException IOException
+     */
+    @RequestMapping(
+            value = {"/policyController/validate_policy.htm"},
+            method = {org.springframework.web.bind.annotation.RequestMethod.POST})
+    public ModelAndView validatePolicy(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        try {
 
-	@RequestMapping(value={"/policyController/validate_policy.htm"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView validatePolicy(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		try{
-			
-			PolicyValidation validation = new PolicyValidation();
-			PolicyValidationRequestWrapper wrapper = new PolicyValidationRequestWrapper();
-			StringBuilder responseString;
-			ObjectMapper mapper = new ObjectMapper();
+            PolicyValidation validation = new PolicyValidation();
+            PolicyValidationRequestWrapper wrapper = new PolicyValidationRequestWrapper();
+            StringBuilder responseString;
+            ObjectMapper mapper = new ObjectMapper();
 
-			PolicyRestAdapter policyData = wrapper.populateRequestParameters(request);
-			responseString = validation.validatePolicy(policyData);
-			
-			PrintWriter out = response.getWriter();
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(responseString.toString()));
-			JSONObject j = new JSONObject(msg);
-			out.write(j.toString());
+            PolicyRestAdapter policyData = wrapper.populateRequestParameters(request);
+            responseString = validation.validatePolicy(policyData);
 
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error("Exception Occured During Policy Validation" +e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-}
\ No newline at end of file
+            response.getWriter().write(new JSONObject(
+                    new JsonMessage(mapper.writeValueAsString(responseString.toString()))).toString());
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured During Policy Validation" + e);
+            response.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);
+            request.setCharacterEncoding(PolicyUtils.CHARACTER_ENCODING);
+            response.getWriter().write(PolicyUtils.CATCH_EXCEPTION);
+        }
+        return null;
+    }
+}