Merge "Addressing Technical Debt for ONAP-XACML"

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java
index 8640784..e73adf8 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPPolicyContainer.java
@@ -27,67 +27,68 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.utils.PolicyContainer;
 import org.onap.policy.utils.PolicyItemSetChangeNotifier;
-import org.onap.policy.common.logging.flexlogger.*;
-
 import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+
 import com.att.research.xacml.api.pap.PDP;
 import com.att.research.xacml.api.pap.PDPGroup;
 import com.att.research.xacml.api.pap.PDPPolicy;
-import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements PolicyContainer.Indexed {
        private static final long serialVersionUID = 1L;
-       private static Logger LOGGER    = FlexLogger.getLogger(PDPPolicyContainer.class);
+       private static final Logger LOGGER      = FlexLogger.getLogger(PDPPolicyContainer.class);
        
         /**
      * String identifier of a file's "Id" property.
      */
-       private static String PROPERTY_ID = "Id";
+       private static final String PROPERTY_ID = "Id";
 
    /**
      * String identifier of a file's "name" property.
      */
-       private static String PROPERTY_NAME = "Name";
+       private static final String PROPERTY_NAME = "Name";
 
     /**
       * String identifier of a file's "name" property.
       */
-       private static String PROPERTY_VERSION = "Version";
+       private static final String PROPERTY_VERSION = "Version";
      
     /**
      * String identifier of a file's "Description" property.
      */
-       private static String PROPERTY_DESCRIPTION = "Description";
+       private static final String PROPERTY_DESCRIPTION = "Description";
     
     /**
      * String identifier of a file's "IsRoot" property.
      */
-       private static String PROPERTY_ISROOT = "Root";
+       private static final String PROPERTY_ISROOT = "Root";
 
     /**
      * List of the string identifiers for the available properties.
      */
-       private static Collection<String> PDPPOLICY_PROPERTIES;
+       private static Collection<String> pDPPolicyProperties;
  
-    private final Object data;
-    private List<PDPPolicy> policies;
+    private final transient Object data;
+    private transient List<PDPPolicy> policies;
     
        @SuppressWarnings("unchecked")
        public PDPPolicyContainer(Object data) {
                super();
                this.data = data;
                if (this.data instanceof PDPGroup) {
-                       policies = new ArrayList<PDPPolicy> (((PDPGroup) this.data).getPolicies());
+                       policies = new ArrayList<> (((PDPGroup) this.data).getPolicies());
                }
                if (this.data instanceof PDP) {
-                       policies = new ArrayList<PDPPolicy> (((PDP) this.data).getPolicies());
+                       policies = new ArrayList<> (((PDP) this.data).getPolicies());
                }
                if (this.data instanceof Set) {
-                       policies = new ArrayList<PDPPolicy> ((Set<PDPPolicy>)data);
+                       policies = new ArrayList<> ((Set<PDPPolicy>)data);
                }
                if (this.policies == null) {
                        LOGGER.info("NULL policies");
@@ -150,7 +151,7 @@ public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements P
                if (this.policies.isEmpty()) {
                        return false;
                }
-               return (itemId.equals(this.policies.get(0)));
+               return itemId.equals(this.policies.get(0));
        }
 
        @Override
@@ -161,18 +162,17 @@ public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements P
                if (this.policies.isEmpty()) {
                        return false;
                }
-               return (itemId.equals(this.policies.get(this.policies.size() - 1)));
+               return itemId.equals(this.policies.get(this.policies.size() - 1));
        }
 
        @Override
-       public Object addItemAfter(Object previousItemId)
-                       throws UnsupportedOperationException {
+       public Object addItemAfter(Object previousItemId) {
                return null;
        }
 
        @Override
        public Collection<?> getContainerPropertyIds() {
-               return PDPPOLICY_PROPERTIES;
+               return pDPPolicyProperties;
        }
 
        @Override
@@ -220,13 +220,12 @@ public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements P
        }
 
        @Override
-       public Object addItem() throws UnsupportedOperationException {
+       public Object addItem() {
                throw new UnsupportedOperationException("Cannot add an empty policy.");
        }
 
        @Override
-       public boolean removeItem(Object itemId)
-                       throws UnsupportedOperationException {
+       public boolean removeItem(Object itemId) {
                if (LOGGER.isTraceEnabled()) {
                        LOGGER.trace("removeItem: " + itemId);
                }
@@ -248,18 +247,17 @@ public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements P
 
        @Override
        public boolean addContainerProperty(Object propertyId, Class<?> type,
-                       Object defaultValue) throws UnsupportedOperationException {
+                       Object defaultValue) {
                return false;
        }
 
        @Override
-       public boolean removeContainerProperty(Object propertyId)
-                       throws UnsupportedOperationException {
+       public boolean removeContainerProperty(Object propertyId) {
                return false;
        }
 
        @Override
-       public boolean removeAllItems() throws UnsupportedOperationException {
+       public boolean removeAllItems() {
                return false;
        }
 
@@ -291,7 +289,7 @@ public class PDPPolicyContainer extends PolicyItemSetChangeNotifier implements P
        }
 
        @Override
-       public Object addItemAt(int index) throws UnsupportedOperationException {
+       public Object addItemAt(int index) {
                if (LOGGER.isTraceEnabled()) {
                        LOGGER.trace("addItemAt: " + index);
                }