Reduce technical debt

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
index a4b7589..f0681a3 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
@@ -122,7 +122,7 @@ public class CreateFirewallController extends RestrictedBaseController {
                String jsonBody="";
                termCollectorList = new ArrayList <>();
                tagCollectorList = new ArrayList <>();
-               if(policyData.getAttributes().size() > 0){
+               if(! policyData.getAttributes().isEmpty()){
                        for(Object attribute : policyData.getAttributes()){
                                if(attribute instanceof LinkedHashMap<?, ?>){
                                        String key = ((LinkedHashMap<?, ?>) attribute).get("key").toString();
@@ -321,7 +321,7 @@ public class CreateFirewallController extends RestrictedBaseController {
                        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
                        JsonNode root = mapper.readTree(request.getReader());
                        PolicyRestAdapter policyData = mapper.readValue(root.get("policyData").toString(), PolicyRestAdapter.class);
-                       if(policyData.getAttributes().size() > 0){
+                       if(! policyData.getAttributes().isEmpty()){
                                for(Object attribute : policyData.getAttributes()){
                                        if(attribute instanceof LinkedHashMap<?, ?>){
                                                String key = ((LinkedHashMap<?, ?>) attribute).get("key").toString();
@@ -548,7 +548,6 @@ public class CreateFirewallController extends RestrictedBaseController {
                        for (int tl = 0 ; tl< termCollectorList.size(); tl++) {
                                expandableList.add(termCollectorList.get(tl));
                                Term targetTerm = new Term();
-                               //targetSl= new ServiceListJson();
                                targetTerm.setRuleName(termCollectorList.get(tl));
                                List<Object> termListData = commonClassDao.getData(TermList.class);
                                for (int j =0; j < termListData.size(); j++) {
@@ -882,7 +881,6 @@ public class CreateFirewallController extends RestrictedBaseController {
                                                        addressMembers.setName(groupString);
                                                        addrMembersList.add(addressMembers);
                                                        //Expand the group Name
-                                                       PrefixIPList expandGroupPrefix;
                                                        addressMembersJson= new AddressMembers();
                                                        valueDesc= mapping (groupString);