More sonar cleanup and line consolidation

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java
index 5782584..c83cb77 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ActionPolicyController.java
@@ -2,15 +2,15 @@
  * ============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.
  * Modifications Copyright (C) 2019 Bell Canada
  * ================================================================================
  * 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.
@@ -30,20 +30,12 @@ import java.util.Map.Entry;
 
 import javax.xml.bind.JAXBElement;
 
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.rest.adapter.PolicyRestAdapter;
-import org.onap.portalsdk.core.controller.RestrictedBaseController;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.ApplyType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeAssignmentExpressionType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.ConditionType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionsType;
@@ -51,8 +43,15 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
 @Controller
-@RequestMapping({ "/" })
+@RequestMapping({"/"})
 public class ActionPolicyController extends RestrictedBaseController {
     private static final Logger LOGGER = FlexLogger.getLogger(ActionPolicyController.class);
     private static final String PERFORMER_ATTRIBUTE_ID = "performer";
@@ -66,6 +65,11 @@ public class ActionPolicyController extends RestrictedBaseController {
         // Default Constructor
     }
 
+    /**
+     * prePopulateActionPolicyData.
+     *
+     * @param policyAdapter PolicyRestAdapter
+     */
     public void prePopulateActionPolicyData(PolicyRestAdapter policyAdapter) {
         ruleAlgorithmList = new ArrayList<>();
         performer.put("PDP", "PDPAction");
@@ -116,15 +120,15 @@ public class ActionPolicyController extends RestrictedBaseController {
         for (ObligationExpressionType obligation : obligationList) {
             policyAdapter.setActionAttributeValue(obligation.getObligationId());
             // Under the obligationExpression we have attributeAssignmentExpression.
-            List<AttributeAssignmentExpressionType> attributeAssignmentExpressionList = obligation
-                .getAttributeAssignmentExpression();
+            List<AttributeAssignmentExpressionType> attributeAssignmentExpressionList =
+                    obligation.getAttributeAssignmentExpression();
             if (attributeAssignmentExpressionList == null) {
                 continue;
             }
             for (AttributeAssignmentExpressionType attributeAssignmentExpression : attributeAssignmentExpressionList) {
                 String attributeID = attributeAssignmentExpression.getAttributeId();
-                AttributeValueType attributeValue = (AttributeValueType) attributeAssignmentExpression
-                    .getExpression().getValue();
+                AttributeValueType attributeValue =
+                        (AttributeValueType) attributeAssignmentExpression.getExpression().getValue();
                 if (!attributeID.equals(PERFORMER_ATTRIBUTE_ID)) {
                     continue;
                 }
@@ -139,8 +143,8 @@ public class ActionPolicyController extends RestrictedBaseController {
 
     private void setPolicyAdapterPolicyNameAndDesc(PolicyRestAdapter policyAdapter, PolicyType policy) {
         policyAdapter.setOldPolicyFileName(policyAdapter.getPolicyName());
-        String policyNameValue = policyAdapter.getPolicyName()
-                .substring(policyAdapter.getPolicyName().indexOf('_') + 1);
+        String policyNameValue =
+                policyAdapter.getPolicyName().substring(policyAdapter.getPolicyName().indexOf('_') + 1);
         policyAdapter.setPolicyName(policyNameValue);
         String description;
         try {
@@ -152,11 +156,10 @@ public class ActionPolicyController extends RestrictedBaseController {
         policyAdapter.setPolicyDescription(description);
     }
 
-    private void setPolicyAdapterRuleAlgorithmschoices(PolicyRestAdapter policyAdapter, RuleType o) {
-        ConditionType condition = o.getCondition();
-        if (condition != null) {
+    private void setPolicyAdapterRuleAlgorithmschoices(PolicyRestAdapter policyAdapter, RuleType ruleType) {
+        if (ruleType.getCondition() != null) {
             int index = 0;
-            ApplyType actionApply = (ApplyType) condition.getExpression().getValue();
+            ApplyType actionApply = (ApplyType) ruleType.getCondition().getExpression().getValue();
             ruleAlgorithmTracker = new LinkedList<>();
             // Populating Rule Algorithms starting from compound.
             prePopulateCompoundRuleAlgorithm(index, actionApply);
@@ -253,7 +256,7 @@ public class ActionPolicyController extends RestrictedBaseController {
         ruleMap.put("id", "A" + (index + 1));
         // Populate combo box
         Map<String, String> dropDownMap = PolicyController.getDropDownMap();
-        for ( Entry<String, String> entry : dropDownMap.entrySet()) {
+        for (Entry<String, String> entry : dropDownMap.entrySet()) {
             if (entry.getValue().equals(actionApply.getFunctionId())) {
                 ruleMap.put("dynamicRuleAlgorithmCombo", entry.getKey());
             }
@@ -264,8 +267,8 @@ public class ActionPolicyController extends RestrictedBaseController {
             // Get from Attribute Designator
             ApplyType innerActionApply = (ApplyType) jaxbActionTypes.get(0).getValue();
             List<JAXBElement<?>> jaxbInnerActionTypes = innerActionApply.getExpression();
-            AttributeDesignatorType attributeDesignator = (AttributeDesignatorType) jaxbInnerActionTypes.get(0)
-                    .getValue();
+            AttributeDesignatorType attributeDesignator =
+                    (AttributeDesignatorType) jaxbInnerActionTypes.get(0).getValue();
             ruleMap.put(DYNAMIC_RULE_ALGORITHM_FIELD_1, attributeDesignator.getAttributeId());
 
             // Get from Attribute Value
@@ -281,8 +284,8 @@ public class ActionPolicyController extends RestrictedBaseController {
 
             ApplyType innerActionApply = (ApplyType) jaxbActionTypes.get(1).getValue();
             List<JAXBElement<?>> jaxbInnerActionTypes = innerActionApply.getExpression();
-            AttributeDesignatorType attributeDesignator = (AttributeDesignatorType) jaxbInnerActionTypes.get(0)
-                    .getValue();
+            AttributeDesignatorType attributeDesignator =
+                    (AttributeDesignatorType) jaxbInnerActionTypes.get(0).getValue();
             ruleMap.put(DYNAMIC_RULE_ALGORITHM_FIELD_1, attributeDesignator.getAttributeId());
         }
         ruleAlgorithmList.add(ruleMap);