More sonar cleanup and line consolidation

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / PolicyValidationController.java

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 fc94087..0c29f8f 100644 (file)
--- 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
@@ -7,9 +7,9 @@
  * 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.
@@ -47,6 +47,14 @@ public class PolicyValidationController extends RestrictedBaseController {
 
     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})
@@ -61,12 +69,8 @@ public class PolicyValidationController extends RestrictedBaseController {
             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());
-
-            return null;
+            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("UTF-8");