String literal comparision on left side

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
index ae2144b..3b3f119 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
@@ -40,66 +40,64 @@ import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 
 import com.att.research.xacml.api.pap.PAPException;
 import com.att.research.xacml.api.pap.PDP;
-//import com.att.research.xacml.api.pap.PDP;
-//import com.att.research.xacml.api.pap.PDPGroup;
 import com.att.research.xacml.api.pap.PDPPIPConfig;
 import com.att.research.xacml.api.pap.PDPPolicy;
 
 public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements PolicyContainer.Indexed, PolicyContainer.ItemSetChangeNotifier {
        private static final long serialVersionUID = 1L;
-       private static Logger LOGGER    = FlexLogger.getLogger(PDPGroupContainer.class);
+       private static final Logger LOGGER      = FlexLogger.getLogger(PDPGroupContainer.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 "Description" property.
      */
-       private static String PROPERTY_DESCRIPTION = "Description";
+       private static final String PROPERTY_DESCRIPTION = "Description";
 
     /**
      * String identifier of a file's "Default" property.
      */
-       private static String PROPERTY_DEFAULT = "Default";
+       private static final String PROPERTY_DEFAULT = "Default";
     /**
      * String identifier of a file's "Status" property.
      */
-       private static String PROPERTY_STATUS = "Status";
+       private static final String PROPERTY_STATUS = "Status";
 
     /**
      * String identifier of a file's "PDPs" property.
      */
-       private static String PROPERTY_PDPS = "PDPs";
+       private static final String PROPERTY_PDPS = "PDPs";
 
     /**
      * String identifier of a file's "Policies" property.
      */
-       private static String PROPERTY_POLICIES = "Policies";
+       private static final String PROPERTY_POLICIES = "Policies";
 
     /**
      * String identifier of a file's "PIP Configurations" property.
      */
-       private static String PROPERTY_PIPCONFIG = "PIP Configurations";
+       private static final String PROPERTY_PIPCONFIG = "PIP Configurations";
     
     /**
      * String identifier of a file's "Selected" property.
      */
-       private static String PROPERTY_SELECTED = "Selected";
+       private static final String PROPERTY_SELECTED = "Selected";
 
     /**
      * List of the string identifiers for the available properties.
      */
-       private static Collection<String> PDP_PROPERTIES;
+       private static Collection<String> pDPProperties;
 
-       private PAPPolicyEngine papEngine = null;
-       protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
+       private transient PAPPolicyEngine papEngine = null;
+       protected transient List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
        
     public PDPGroupContainer(PAPPolicyEngine papPolicyEngine) {
                super();
@@ -107,7 +105,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
                //
                //
                //
-               this.papEngine = (PAPPolicyEngine) papPolicyEngine;
+               this.papEngine = papPolicyEngine;
                //
                //
                //
@@ -144,7 +142,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        
        public void makeDefault(OnapPDPGroup group) {
                try {
-                       this.papEngine.SetDefaultGroup(group);
+                       this.papEngine.setDefaultGroup(group);
                } catch (PAPException e) {
                        String message = "Unable to set Default Group on server: " + e;
                        LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e);
@@ -197,7 +195,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        
        @Override
        public Collection<?> getContainerPropertyIds() {
-               return PDP_PROPERTIES;
+               return pDPProperties;
        }
 
        @Override
@@ -367,7 +365,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        @Override
        public Object firstItemId() {
                synchronized (this.groups) {
-                       if (this.groups.size() > 0) {
+                       if (!this.groups.isEmpty()) {
                                return this.groups.get(0);
                        }
                }
@@ -377,7 +375,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        @Override
        public Object lastItemId() {
                synchronized (this.groups) {
-                       if (this.groups.size() > 0) {
+                       if (!this.groups.isEmpty()) {
                                return this.groups.get(this.groups.size() - 1);
                        }
                }
@@ -387,8 +385,8 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        @Override
        public boolean isFirstId(Object itemId) {
                synchronized (this.groups) {
-                       if (this.groups.size() > 0) {
-                               return (this.groups.get(0).equals(itemId));
+                       if (!this.groups.isEmpty()) {
+                               return this.groups.get(0).equals(itemId);
                        }
                }
                return false;
@@ -397,8 +395,8 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
        @Override
        public boolean isLastId(Object itemId) {
                synchronized (this.groups) {
-                       if (this.groups.size() > 0) {
-                               return (this.groups.get(this.groups.size() - 1).equals(itemId));
+                       if (!this.groups.isEmpty()) {
+                               return this.groups.get(this.groups.size() - 1).equals(itemId);
                        }
                }
                return false;
@@ -446,7 +444,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
                //
                // You cannot remove the default group
                //
-               if (((OnapPDPGroup) itemId).getId().equals("Default")) {
+               if ("Default".equals(((OnapPDPGroup) itemId).getId())) {
                        throw new UnsupportedOperationException("You can't remove the Default Group.");
                }
                //