Merge "Implement Encryption on Passwords"

[policy/engine.git] / ONAP-XACML / src / main / java / org / onap / policy / xacml / std / pap / StdPDPGroupStatus.java

diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java
index 296f738..dd9bf0a 100644 (file)
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroupStatus.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-XACML
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,9 +58,11 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
        private Set<PDP>                        unknownPDPs = new HashSet<>();
        
        
-       // Constructor needed for JSON deserialization
+       
        public StdPDPGroupStatus() {
-               
+               //
+               // Constructor needed for JSON deserialization
+               //
        }
        
        public StdPDPGroupStatus(Status status) {
@@ -69,18 +71,30 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
 
        public StdPDPGroupStatus(PDPGroupStatus stat) {
                this.status = stat.getStatus();
-               this.failedPDPs.clear(); this.failedPDPs.addAll(stat.getFailedPDPs());
-               this.failedPIPConfigs.clear(); this.failedPIPConfigs.addAll(stat.getFailedPipConfigs());
-               this.failedPolicies.clear(); this.failedPolicies.addAll(stat.getFailedPolicies());
-               this.inSynchPDPs.clear(); this.inSynchPDPs.addAll(stat.getInSynchPDPs());
-               this.lastUpdateFailedPDPs.clear(); this.lastUpdateFailedPDPs.addAll(stat.getLastUpdateFailedPDPs());
-               this.loadedPIPConfigs.clear(); this.loadedPIPConfigs.addAll(stat.getLoadedPipConfigs());
-               this.loadedPolicies.clear(); this.loadedPolicies.addAll(stat.getLoadedPolicies());
-               this.loadErrors.clear(); this.loadErrors.addAll(stat.getLoadErrors());
-               this.loadWarnings.clear(); this.loadWarnings.addAll(stat.getLoadWarnings());
-               this.outOfSynchPDPs.clear(); this.outOfSynchPDPs.addAll(stat.getOutOfSynchPDPs());
-               this.unknownPDPs.clear(); this.unknownPDPs.addAll(stat.getUpdatingPDPs());
-               this.updatingPDPs.clear(); this.updatingPDPs.addAll(stat.getUpdatingPDPs());
+               this.failedPDPs.clear(); 
+               this.failedPDPs.addAll(stat.getFailedPDPs());
+               this.failedPIPConfigs.clear(); 
+               this.failedPIPConfigs.addAll(stat.getFailedPipConfigs());
+               this.failedPolicies.clear(); 
+               this.failedPolicies.addAll(stat.getFailedPolicies());
+               this.inSynchPDPs.clear(); 
+               this.inSynchPDPs.addAll(stat.getInSynchPDPs());
+               this.lastUpdateFailedPDPs.clear(); 
+               this.lastUpdateFailedPDPs.addAll(stat.getLastUpdateFailedPDPs());
+               this.loadedPIPConfigs.clear(); 
+               this.loadedPIPConfigs.addAll(stat.getLoadedPipConfigs());
+               this.loadedPolicies.clear(); 
+               this.loadedPolicies.addAll(stat.getLoadedPolicies());
+               this.loadErrors.clear(); 
+               this.loadErrors.addAll(stat.getLoadErrors());
+               this.loadWarnings.clear(); 
+               this.loadWarnings.addAll(stat.getLoadWarnings());
+               this.outOfSynchPDPs.clear(); 
+               this.outOfSynchPDPs.addAll(stat.getOutOfSynchPDPs());
+               this.unknownPDPs.clear(); 
+               this.unknownPDPs.addAll(stat.getUpdatingPDPs());
+               this.updatingPDPs.clear(); 
+               this.updatingPDPs.addAll(stat.getUpdatingPDPs());
        }
 
        public Set<PDPPIPConfig> getLoadedPIPConfigs() {
@@ -177,7 +191,7 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
 
        @Override
        public boolean policiesOK() {
-               if (this.failedPolicies.size() > 0) {
+               if (!this.failedPolicies.isEmpty()) {
                        return false;
                }
                return true;
@@ -203,7 +217,7 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
 
        @Override
        public boolean pipConfigOK() {
-               if (this.failedPIPConfigs.size() > 0) {
+               if (!this.failedPIPConfigs.isEmpty()) {
                        return false;
                }
                return true;
@@ -266,16 +280,16 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
 
        @Override
        public boolean pdpsOK() {
-               if (this.outOfSynchPDPs.size() > 0) {
+               if (!this.outOfSynchPDPs.isEmpty()) {
                        return false;
                }
-               if (this.failedPDPs.size() > 0) {
+               if (!this.failedPDPs.isEmpty()) {
                        return false;
                }
-               if (this.lastUpdateFailedPDPs.size() > 0) {
+               if (!this.lastUpdateFailedPDPs.isEmpty()) {
                        return false;
                }
-               if (this.unknownPDPs.size() > 0) {
+               if (!this.unknownPDPs.isEmpty()) {
                        return false;
                }
                return true;
@@ -284,19 +298,19 @@ public class StdPDPGroupStatus implements PDPGroupStatus {
        @Override
        @JsonIgnore
        public boolean isGroupOk() {
-               if (this.policiesOK() == false) {
+               if (!this.policiesOK()) {
                        return false;
                }
-               if (this.pipConfigOK() == false) {
+               if (!this.pipConfigOK()) {
                        return false;
                }
-               if (this.pdpsOK() == false) {
+               if (!this.pdpsOK()) {
                        return false;
                }
-               if (this.loadErrors.isEmpty() == false) {
+               if (!this.loadErrors.isEmpty()) {
                        return false;
                }
-               return (this.status == Status.OK);
+               return this.status == Status.OK;
        }
        
        public void reset() {