1 files changed, 10 insertions, 12 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.java
index cc9cc16a0..40cb8aaf9 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/APIRequestHandler.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.
@@ -34,7 +34,7 @@ public class APIRequestHandler {
 
     private OnapPDPGroup newGroup;
 
-    public void doGet(HttpServletRequest request, HttpServletResponse response, String apiflag) throws IOException{
+    public void doGet(HttpServletRequest request, HttpServletResponse response, String apiflag) throws IOException {
         // Request from the API to get Dictionary Items
         if ("api".equalsIgnoreCase(apiflag)) {
             DictionaryHandler dictionaryHandler = DictionaryHandler.getInstance();
@@ -42,25 +42,25 @@ public class APIRequestHandler {
             return;
         }
         // Request from the API to get the ActiveVersion from the PolicyVersion table
-        if ("version".equalsIgnoreCase(apiflag)){
+        if ("version".equalsIgnoreCase(apiflag)) {
             PushPolicyHandler pushHandler = new PushPolicyHandler();
             pushHandler.getActiveVersion(request, response);
             return;
         }
         // Request from the API to get the URI from the gitpath
-        if ("uri".equalsIgnoreCase(apiflag)){
+        if ("uri".equalsIgnoreCase(apiflag)) {
             PushPolicyHandler pushHandler = new PushPolicyHandler();
             pushHandler.getSelectedURI(request, response);
             return;
         }
-        if ("getMetrics".equalsIgnoreCase(apiflag)){
+        if ("getMetrics".equalsIgnoreCase(apiflag)) {
             MetricService.doGetPolicyMetrics(response);
-            return;
         }
     }
 
     public void doPut(HttpServletRequest request, HttpServletResponse response, String service) throws IOException {
-        if ("MICROSERVICE".equalsIgnoreCase(service) || "BRMSPARAM".equalsIgnoreCase(service) || "OPTIMIZATION".equalsIgnoreCase(service)){
+        if ("MICROSERVICE".equalsIgnoreCase(service) || "BRMSPARAM".equalsIgnoreCase(service) ||
+                "OPTIMIZATION".equalsIgnoreCase(service)) {
             ImportService importService = new ImportService();
             importService.doImportMicroServicePut(request, response);
             return;
@@ -68,22 +68,20 @@ public class APIRequestHandler {
         if ("dictionaryItem".equalsIgnoreCase(service)) {
             DictionaryHandler dictionaryHandler = DictionaryHandler.getInstance();
             dictionaryHandler.doDictionaryAPIPut(request, response);
-            return;
         } else {
             SavePolicyHandler savePolicy = SavePolicyHandler.getInstance();
             savePolicy.doPolicyAPIPut(request, response);
         }
     }
 
-    public void doDelete(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext, String apiflag) throws IOException, SQLException{
+    public void doDelete(HttpServletRequest request, HttpServletResponse response, ONAPLoggingContext loggingContext,
+                         String apiflag) throws IOException, SQLException {
         DeleteHandler deleteHandler = DeleteHandler.getInstance();
         if ("deletePapApi".equalsIgnoreCase(apiflag)) {
             deleteHandler.doAPIDeleteFromPAP(request, response);
-            return;
         } else if ("deletePdpApi".equalsIgnoreCase(apiflag)) {
             deleteHandler.doAPIDeleteFromPDP(request, response, loggingContext);
             setNewGroup(deleteHandler.getDeletedGroup());
-            return;
         }
     }