X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-XACML%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fxacml%2Fstd%2Fpap%2FStdPDPGroup.java;h=bdbbf33f75511e474a86e14829108b0bee47a157;hb=7bb6ef9ad8a483bdac3ff1544cd0910ecebe5a98;hp=9289c2461a4dc07ed996ac6ca62a19c541ae76ac;hpb=7d3735c062a378b4d5b05859e740c408fd2d0239;p=policy%2Fengine.git

diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.java
index 9289c2461..bdbbf33f7 100644
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPDPGroup.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.
@@ -89,6 +89,21 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 	@JsonIgnore
 	private Integer jmxport;
 	
+	public StdPDPGroup() {
+		//
+		// Methods needed for JSON deserialization
+		//
+	}
+	
+	public StdPDPGroup(OnapPDPGroup group) {
+		this.id = group.getId();
+		this.name = group.getName();
+		this.description = group.getDescription();
+		this.isDefault = group.isDefaultGroup();
+		this.pdps = group.getOnapPdps();
+		this.policies = group.getPolicies();
+		this.pipConfigs = group.getPipConfigs();
+	}
 	
 	public StdPDPGroup(String id, Path directory) {
 		this.id = id;
@@ -333,7 +348,6 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 		// to occur: 1) old default=false (don't want to fire) and
 		// then 2) new default=true (yes fire - but we'll have to do that
 		// elsewhere.
-		//this.firePDPGroupChanged(this);
 	}
 
 	@Override
@@ -474,7 +488,7 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 			logger.info("Copied " + num + " bytes for policy " + name);
 			
 			StdPDPPolicy tempRootPolicy = new StdPDPPolicy(id, isRoot, name, tempFile.toUri());
-			if (tempRootPolicy.isValid() == false) {
+			if (!tempRootPolicy.isValid()) {
 				try {
 					Files.delete(tempFile);
 				} catch(Exception ee) {
@@ -544,7 +558,7 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 			
 			// policy is new to this group
 			StdPDPPolicy tempRootPolicy = new StdPDPPolicy(id, true, name, policyFile.toUri());
-			if (tempRootPolicy.isValid() == false) {
+			if (!tempRootPolicy.isValid()) {
 				try {
 					Files.delete(policyFile);
 				} catch(Exception ee) {
@@ -606,7 +620,7 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 			
 			// policy is new to this group
 			StdPDPPolicy tempRootPolicy = new StdPDPPolicy(id, true, name, policyFile.toUri());
-			if (tempRootPolicy.isValid() == false) {
+			if (!tempRootPolicy.isValid()) {
 				try {
 					Files.delete(policyFile);
 				} catch(Exception ee) {
@@ -924,23 +938,6 @@ public class StdPDPGroup extends StdPDPItemSetChangeNotifier implements OnapPDPG
 		this.changed();
 	}
 
-	
-	public StdPDPGroup() {
-		//
-		// Methods needed for JSON deserialization
-		//
-	}
-	
-	public StdPDPGroup(OnapPDPGroup group) {
-		this.id = group.getId();
-		this.name = group.getName();
-		this.description = group.getDescription();
-		this.isDefault = group.isDefaultGroup();
-		this.pdps = group.getOnapPdps();
-		this.policies = group.getPolicies();
-		this.pipConfigs = group.getPipConfigs();
-	}
-
 	public boolean isDefault() {
 		return isDefault;
 	}