X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-XACML%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fxacml%2Fstd%2Fpap%2FStdEngine.java;h=3173bc16d7e52f9d79443dddaac92b5ce05bed66;hb=7d3735c062a378b4d5b05859e740c408fd2d0239;hp=14d7c7f6266b8a3b04d0c2f828866b114712d640;hpb=6f2b3f2dd0e80895acd0f77aa5784e717be33696;p=policy%2Fengine.git diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java index 14d7c7f62..3173bc16d 100644 --- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java +++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java @@ -66,8 +66,10 @@ import com.google.common.collect.Sets; */ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyEngine { public static final String pipPropertyFile = "pip.properties"; + + private static final String addGroup = "addGroup "; - private static Log logger = LogFactory.getLog(StdEngine.class); + private static Log logger = LogFactory.getLog(StdEngine.class); public static final String PROP_PAP_REPO = "xacml.pap.pdps"; public static final String PROP_PAP_GROUPS = "xacml.pap.groups"; @@ -171,6 +173,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // PDPGroup group = this.getDefaultGroup(); if (group != null) { + wasDefaultGroupJustAdded = true; return group; } // @@ -180,14 +183,14 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE if(defaultId == null){ defaultId = PROP_PAP_GROUPS_DEFAULT_NAME; } - if(defaultId.equals("")){ + if("".equals(defaultId)){ defaultId = PROP_PAP_GROUPS_DEFAULT_NAME; } //we're going to check one more time in case the PROP_PAP_GROUPS_DEFAULT_NAME doesn't exist if(defaultId == null){ defaultId = "default"; } - if(defaultId.equals("")){ + if("".equals(defaultId)){ defaultId = "default"; } logger.warn("Default group does NOT exist, creating " + defaultId); @@ -317,7 +320,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // If it exists already // if (Files.exists(groupPath)) { - logger.warn("addGroup " + id + " directory exists" + groupPath.toString()); + logger.warn(addGroup + id + " directory exists" + groupPath.toString()); } else { try { // @@ -335,7 +338,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE Path policyProperties = Paths.get(groupPath.toString(), "xacml.policy.properties"); if (Files.exists(policyProperties)) { - logger.warn("addGroup " + id + " file exists: " + policyProperties.toString()); + logger.warn(addGroup + id + " file exists: " + policyProperties.toString()); } else { Properties props = new Properties(); props.setProperty(XACMLProperties.PROP_REFERENCEDPOLICIES, ""); @@ -356,7 +359,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE Path pipProperties = Paths.get(groupPath.toString(), "xacml.pip.properties"); Properties props = new Properties(); if (Files.exists(pipProperties)) { - logger.warn("addGroup " + id + " file exists: " + pipProperties.toString()); + logger.warn(addGroup + id + " file exists: " + pipProperties.toString()); } else { try { props = setPIPProperties(props); @@ -535,10 +538,13 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE throw new PAPException("Unknown PDP Group: " + group.getId()); } - // Currently not used on the PAP side. This is done by ((StdPDPGroup) group).copyPolicyToFile + @Override public void copyPolicy(PDPPolicy policy, OnapPDPGroup group) throws PAPException { + // + // Currently not used on the PAP side. This is done by ((StdPDPGroup) group).copyPolicyToFile + // } @@ -561,7 +567,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // private Set readProperties(Path repository, Properties properties) throws PAPException { - Set groups = new HashSet<>(); + Set pdpGroups = new HashSet<>(); // // See if there is a groups property // @@ -588,15 +594,15 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // // Add it in // - groups.add(g); + pdpGroups.add(g); } // // Dump what we got // if (logger.isDebugEnabled()) { - logger.debug("PDP Group List: " + groups.toString()); + logger.debug("PDP Group List: " + pdpGroups.toString()); } - return groups; + return pdpGroups; } private void saveConfiguration() throws PAPException, IOException { @@ -619,16 +625,16 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE List ids = new ArrayList<>(); for (PDPGroup group : this.groups) { ids.add(group.getId()); - properties.setProperty(group.getId() + ".name", (group.getName() == null ? "" : group.getName())); - properties.setProperty(group.getId() + ".description", (group.getDescription() == null ? "" : group.getDescription())); + properties.setProperty(group.getId() + ".name", group.getName() == null ? "" : group.getName()); + properties.setProperty(group.getId() + ".description", group.getDescription() == null ? "" : group.getDescription()); // // Iterate its PDPs // List pdps = new ArrayList<>(); for (PDP pdp : group.getPdps()) { pdps.add(pdp.getId()); - properties.setProperty(pdp.getId() + ".name", (pdp.getName() == null ? "" : pdp.getName())); - properties.setProperty(pdp.getId() + ".description", (pdp.getDescription() == null ? "" : pdp.getDescription())); + properties.setProperty(pdp.getId() + ".name", pdp.getName() == null ? "" : pdp.getName()); + properties.setProperty(pdp.getId() + ".description", pdp.getDescription() == null ? "" : pdp.getDescription()); if (pdp instanceof OnapPDP) { properties.setProperty(pdp.getId() + ".jmxport", (((OnapPDP)pdp).getJmxPort()==0 ? "" : ((OnapPDP)pdp).getJmxPort()).toString()); } @@ -692,15 +698,17 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE inList = true; } } - if (inList == false) { + if (!inList) { Set grps = Sets.newHashSet(groups); grps.add(group.getId()); - String newGroupList = "";; + String newGroupList; if (grps.size() == 1) { newGroupList = grps.iterator().next(); } else if (grps.size() > 1) { newGroupList = Joiner.on(',').skipNulls().join(grps); - } + } else { + newGroupList = ""; + } logger.info("New Group List: " + newGroupList); properties.setProperty(PROP_PAP_GROUPS, newGroupList); } @@ -712,7 +720,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // // Set its PDP list // - if (group.getPdps().size() > 0) { + if (!group.getPdps().isEmpty()) { String pdpList = ""; if (group.getPdps().size() == 1) { pdpList = group.getPdps().iterator().next().getId(); @@ -784,7 +792,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE } catch (IOException e) { PolicyLogger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "can not load the pip properties from file" +e); } - props = prop; + props = prop; } return props; } @@ -810,7 +818,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE } @Override - public void SetDefaultGroup(OnapPDPGroup group) throws PAPException { + public void setDefaultGroup(OnapPDPGroup group) throws PAPException { boolean changesMade = false; for (OnapPDPGroup aGroup : groups) { if (aGroup.getId().equals(group.getId())) { @@ -848,7 +856,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE if (group == null) { throw new PAPException("You must specify which group the PDP will belong to."); } - if (this.groups.contains(group) == false) { + if (!this.groups.contains(group)) { throw new PAPException("Unknown group, not in our list."); } for (OnapPDP p : group.getOnapPdps()) { @@ -952,7 +960,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // // Does this group exist? // - if (this.groups.contains(group) == false) { + if (!this.groups.contains(group)) { PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "This group doesn't exist."); throw new PAPException("The group '" + group.getId() + "' does not exist"); } @@ -966,13 +974,13 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // // Are there PDPs? If so, then we need a target group // - if (pdps.isEmpty() == false && newGroup == null) { + if (!pdps.isEmpty() && newGroup == null) { throw new NullPointerException("Group targeted for deletion has PDPs, you must provide a new group for them."); } // // Move the PDPs // - if (pdps.isEmpty() == false) { + if (!pdps.isEmpty()) { if (! (newGroup instanceof StdPDPGroup)) { throw new PAPException("Unexpected class for newGroup: " + newGroup.getClass().getCanonicalName()); }