You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by co...@apache.org on 2015/05/06 11:58:10 UTC
incubator-openaz git commit: More code cleanup
Repository: incubator-openaz
Updated Branches:
refs/heads/master c2bdd0de6 -> 14caf3060
More code cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/14caf306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/14caf306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/14caf306
Branch: refs/heads/master
Commit: 14caf30609a01917815caa135eb41f70cbe7e467
Parents: c2bdd0d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed May 6 10:57:53 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 6 10:57:53 2015 +0100
----------------------------------------------------------------------
.../att/research/xacml/api/pap/PAPEngine.java | 40 +++---
.../com/att/research/xacml/api/pap/PDP.java | 16 +--
.../att/research/xacml/api/pap/PDPGroup.java | 30 ++---
.../research/xacml/api/pap/PDPGroupStatus.java | 34 ++---
.../research/xacml/api/pap/PDPPIPConfig.java | 12 +-
.../att/research/xacml/api/pap/PDPPolicy.java | 20 +--
.../att/research/xacml/api/pap/PDPStatus.java | 24 ++--
.../att/research/xacml/api/pdp/PDPEngine.java | 6 +-
.../xacml/api/pdp/PDPEngineFactory.java | 6 +-
.../research/xacml/api/pdp/ScopeResolver.java | 2 +-
.../xacml/api/pdp/ScopeResolverResult.java | 4 +-
.../att/research/xacml/api/pep/PEPEngine.java | 2 +-
.../att/research/xacml/api/pip/PIPEngine.java | 10 +-
.../att/research/xacml/api/pip/PIPFinder.java | 10 +-
.../att/research/xacml/api/pip/PIPRequest.java | 8 +-
.../att/research/xacml/api/pip/PIPResponse.java | 6 +-
.../research/xacml/api/trace/TraceEngine.java | 4 +-
.../research/xacml/api/trace/TraceEvent.java | 8 +-
.../att/research/xacml/api/trace/Traceable.java | 4 +-
.../research/xacml/std/pap/StdPDPStatus.java | 44 ++++---
.../com/att/research/xacml/util/ListUtil.java | 2 +-
.../com/att/research/xacml/util/ObjUtil.java | 7 +-
.../att/research/xacml/util/StringUtils.java | 2 +-
.../xacml/util/XACMLPolicyAggregator.java | 19 ++-
.../research/xacml/util/XACMLPolicyScanner.java | 131 ++++++++-----------
.../research/xacml/util/XACMLProperties.java | 8 +-
.../att/research/xacml/util/XACMLRepair.java | 3 -
27 files changed, 224 insertions(+), 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PAPEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PAPEngine.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PAPEngine.java
index f7a2943..0dd7f57 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PAPEngine.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PAPEngine.java
@@ -39,17 +39,17 @@ public interface PAPEngine {
// Group-level operations
//
- public PDPGroup getDefaultGroup() throws PAPException;
+ PDPGroup getDefaultGroup() throws PAPException;
- public void SetDefaultGroup(PDPGroup group) throws PAPException;
+ void SetDefaultGroup(PDPGroup group) throws PAPException;
- public Set<PDPGroup> getPDPGroups() throws PAPException;
+ Set<PDPGroup> getPDPGroups() throws PAPException;
- public PDPGroup getGroup(String id) throws PAPException;
+ PDPGroup getGroup(String id) throws PAPException;
- public void newGroup(String name, String description) throws PAPException, NullPointerException;
+ void newGroup(String name, String description) throws PAPException, NullPointerException;
- public void updateGroup(PDPGroup group) throws PAPException;
+ void updateGroup(PDPGroup group) throws PAPException;
/**
* @param group - to delete
@@ -58,32 +58,32 @@ public interface PAPEngine {
* @throws PAPException
* @throws NullPointerException
*/
- public void removeGroup(PDPGroup group, PDPGroup newGroup) throws PAPException, NullPointerException;
+ void removeGroup(PDPGroup group, PDPGroup newGroup) throws PAPException, NullPointerException;
- public PDPGroup getPDPGroup(PDP pdp) throws PAPException;
+ PDPGroup getPDPGroup(PDP pdp) throws PAPException;
- public PDPGroup getPDPGroup(String pdpId) throws PAPException;
+ PDPGroup getPDPGroup(String pdpId) throws PAPException;
/**
* Special case - for REST this contacts the PDP for status Details, but the non-RESTful version is never
* called
*/
- public PDPStatus getStatus(PDP pdp) throws PAPException;
+ PDPStatus getStatus(PDP pdp) throws PAPException;
//
// PDP operations
//
- public PDP getPDP(String pdpId) throws PAPException;
+ PDP getPDP(String pdpId) throws PAPException;
- public void newPDP(String id, PDPGroup group, String name, String description) throws PAPException,
+ void newPDP(String id, PDPGroup group, String name, String description) throws PAPException,
NullPointerException;
- public void movePDP(PDP pdp, PDPGroup newGroup) throws PAPException;
+ void movePDP(PDP pdp, PDPGroup newGroup) throws PAPException;
- public void updatePDP(PDP pdp) throws PAPException;
+ void updatePDP(PDP pdp) throws PAPException;
- public void removePDP(PDP pdp) throws PAPException;
+ void removePDP(PDP pdp) throws PAPException;
//
// Policy operations
@@ -94,17 +94,17 @@ public interface PAPEngine {
// TODO We really want to be able to make multiple changes to the group in one operation, including
// changing a file from root to referenced and back.
// TODO This method should be replaced with two methods:
- // TODO public boolean copyFile(String policyId, PDPGroup group, InputStream policy) throws PAPException
+ // TODO boolean copyFile(String policyId, PDPGroup group, InputStream policy) throws PAPException
// TODO (just copy the file and throw exception if the copy fails)
- // TODO public PDPGroup updateGroup(group) throws PAPException
+ // TODO PDPGroup updateGroup(group) throws PAPException
// TODO where the group has been changed locally to the way we want it to be on the server.
- public void publishPolicy(String id, String name, boolean isRoot, InputStream policy, PDPGroup group)
+ void publishPolicy(String id, String name, boolean isRoot, InputStream policy, PDPGroup group)
throws PAPException;
// copy the given policy file into the group's directory, but do not include the policy in the group's
// policy set
- public void copyPolicy(PDPPolicy policy, PDPGroup group) throws PAPException;
+ void copyPolicy(PDPPolicy policy, PDPGroup group) throws PAPException;
- public void removePolicy(PDPPolicy policy, PDPGroup group) throws PAPException;
+ void removePolicy(PDPPolicy policy, PDPGroup group) throws PAPException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDP.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDP.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDP.java
index cf2b064..81b24ed 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDP.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDP.java
@@ -46,19 +46,19 @@ import java.util.Set;
})
public interface PDP {
- public String getId();
+ String getId();
- public String getName();
+ String getName();
- public void setName(String name);
+ void setName(String name);
- public String getDescription();
+ String getDescription();
- public void setDescription(String description);
+ void setDescription(String description);
- public PDPStatus getStatus();
+ PDPStatus getStatus();
- public Set<PDPPolicy> getPolicies();
+ Set<PDPPolicy> getPolicies();
- public Set<PDPPIPConfig> getPipConfigs();
+ Set<PDPPIPConfig> getPipConfigs();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroup.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroup.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroup.java
index 2a0c507..6e58da5 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroup.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroup.java
@@ -41,37 +41,37 @@ public interface PDPGroup {
* file. The ID does not need to be unique forever. It just needs to distinguish this group from other
* groups that currently exist.
*/
- public String getId();
+ String getId();
- public boolean isDefaultGroup();
+ boolean isDefaultGroup();
/*
* The name is a free-form string that is user input.
*/
- public String getName();
+ String getName();
- public void setName(String name);
+ void setName(String name);
- public String getDescription();
+ String getDescription();
- public void setDescription(String description);
+ void setDescription(String description);
- public PDPGroupStatus getStatus();
+ PDPGroupStatus getStatus();
- public Set<PDP> getPdps();
+ Set<PDP> getPdps();
- public Set<PDPPolicy> getPolicies();
+ Set<PDPPolicy> getPolicies();
- public PDPPolicy getPolicy(String id);
+ PDPPolicy getPolicy(String id);
- public Properties getPolicyProperties();
+ Properties getPolicyProperties();
- public Set<PDPPIPConfig> getPipConfigs();
+ Set<PDPPIPConfig> getPipConfigs();
- public PDPPIPConfig getPipConfig(String id);
+ PDPPIPConfig getPipConfig(String id);
- public Properties getPipConfigProperties();
+ Properties getPipConfigProperties();
- public void repair();
+ void repair();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroupStatus.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroupStatus.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroupStatus.java
index e937b19..88624c5 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroupStatus.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPGroupStatus.java
@@ -46,7 +46,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
})
public interface PDPGroupStatus {
- public enum Status {
+ enum Status {
OK,
OUT_OF_SYNCH,
LOAD_ERRORS,
@@ -56,35 +56,35 @@ public interface PDPGroupStatus {
Status getStatus();
- public Set<String> getLoadErrors();
+ Set<String> getLoadErrors();
- public Set<String> getLoadWarnings();
+ Set<String> getLoadWarnings();
- public Set<PDPPolicy> getLoadedPolicies();
+ Set<PDPPolicy> getLoadedPolicies();
- public Set<PDPPolicy> getFailedPolicies();
+ Set<PDPPolicy> getFailedPolicies();
- public boolean policiesOK();
+ boolean policiesOK();
- public Set<PDPPIPConfig> getLoadedPipConfigs();
+ Set<PDPPIPConfig> getLoadedPipConfigs();
- public Set<PDPPIPConfig> getFailedPipConfigs();
+ Set<PDPPIPConfig> getFailedPipConfigs();
- public boolean pipConfigOK();
+ boolean pipConfigOK();
- public Set<PDP> getInSynchPDPs();
+ Set<PDP> getInSynchPDPs();
- public Set<PDP> getOutOfSynchPDPs();
+ Set<PDP> getOutOfSynchPDPs();
- public Set<PDP> getFailedPDPs();
+ Set<PDP> getFailedPDPs();
- public Set<PDP> getUpdatingPDPs();
+ Set<PDP> getUpdatingPDPs();
- public Set<PDP> getLastUpdateFailedPDPs();
+ Set<PDP> getLastUpdateFailedPDPs();
- public Set<PDP> getUnknownStatusPDPs();
+ Set<PDP> getUnknownStatusPDPs();
- public boolean pdpsOK();
+ boolean pdpsOK();
- public boolean isGroupOk();
+ boolean isGroupOk();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPIPConfig.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPIPConfig.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPIPConfig.java
index 08397cb..bf290c4 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPIPConfig.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPIPConfig.java
@@ -46,16 +46,16 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
})
public interface PDPPIPConfig {
- public String getId();
+ String getId();
- public String getName();
+ String getName();
- public String getDescription();
+ String getDescription();
- public String getClassname();
+ String getClassname();
- public Map<String, String> getConfiguration();
+ Map<String, String> getConfiguration();
- public boolean isConfigured();
+ boolean isConfigured();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
index 17592d6..ba08bf3 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
@@ -48,23 +48,23 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
})
public interface PDPPolicy {
- public String getId();
+ String getId();
- public String getName();
+ String getName();
- public String getPolicyId();
+ String getPolicyId();
- public String getDescription();
+ String getDescription();
- public String getVersion();
+ String getVersion();
- public int[] getVersionInts();
+ int[] getVersionInts();
- public boolean isRoot();
+ boolean isRoot();
- public boolean isValid();
+ boolean isValid();
- public InputStream getStream() throws PAPException, IOException;
+ InputStream getStream() throws PAPException, IOException;
- public URI getLocation() throws PAPException, IOException;
+ URI getLocation() throws PAPException, IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
index be20aac..cd50521 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
@@ -46,7 +46,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
})
public interface PDPStatus {
- public enum Status {
+ enum Status {
UP_TO_DATE,
OUT_OF_SYNCH,
LOAD_ERRORS,
@@ -57,26 +57,26 @@ public interface PDPStatus {
CANNOT_CONNECT
}
- public Status getStatus();
+ Status getStatus();
- public Set<String> getLoadErrors();
+ Set<String> getLoadErrors();
- public Set<String> getLoadWarnings();
+ Set<String> getLoadWarnings();
- public Set<PDPPolicy> getLoadedPolicies();
+ Set<PDPPolicy> getLoadedPolicies();
- public Set<PDPPolicy> getLoadedRootPolicies();
+ Set<PDPPolicy> getLoadedRootPolicies();
- public Set<PDPPolicy> getFailedPolicies();
+ Set<PDPPolicy> getFailedPolicies();
- public boolean policiesOK();
+ boolean policiesOK();
- public Set<PDPPIPConfig> getLoadedPipConfigs();
+ Set<PDPPIPConfig> getLoadedPipConfigs();
- public Set<PDPPIPConfig> getFailedPipConfigs();
+ Set<PDPPIPConfig> getFailedPipConfigs();
- public boolean pipConfigOK();
+ boolean pipConfigOK();
- public boolean isOk();
+ boolean isOk();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngine.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngine.java
index bdc1ebc..afb270d 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngine.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngine.java
@@ -48,7 +48,7 @@ public interface PDPEngine {
* @param pepRequest the <code>Request</code> to evaluate
* @return a {@link com.att.research.xacml.api.Response} indicating the decision
*/
- public Response decide(Request pepRequest) throws PDPException;
+ Response decide(Request pepRequest) throws PDPException;
/**
* Gets the <code>Collection</code> of <code>URI</code>s that represent the profiles supported by this
@@ -57,7 +57,7 @@ public interface PDPEngine {
* @return an <code>Collection</code> over the <code>URI</code>s that represent the profiles supported by
* this <code>PDPEngine</code>.
*/
- public Collection<URI> getProfiles();
+ Collection<URI> getProfiles();
/**
* Determines if this <code>PDPEngine</code> supports the given <code>URI</code> profile.
@@ -65,5 +65,5 @@ public interface PDPEngine {
* @param uriProfile the <code>URI</code> representing the profile feature requested.
* @return true if the profile is supported, else false
*/
- public boolean hasProfile(URI uriProfile);
+ boolean hasProfile(URI uriProfile);
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
index 2c7084a..84f42c6 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
@@ -53,18 +53,16 @@ public abstract class PDPEngineFactory {
String defaultDecisionString = XACMLProperties.getProperty(XACMLProperties.PROP_PDP_BEHAVIOR);
if (defaultDecisionString != null && defaultDecisionString.length() > 0) {
return Decision.get(defaultDecisionString);
- } else {
- return null;
}
+ return null;
}
protected static Decision getConfiguredDefaultBehavior(Properties properties) {
String defaultDecisionString = properties.getProperty(XACMLProperties.PROP_PDP_BEHAVIOR);
if (defaultDecisionString != null && defaultDecisionString.length() > 0) {
return Decision.get(defaultDecisionString);
- } else {
- return null;
}
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolver.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolver.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolver.java
index c3d0d3c..ef1bd83 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolver.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolver.java
@@ -48,6 +48,6 @@ public interface ScopeResolver {
* @return a {@link com.att.research.xacml.api.pdp.ScopeResolverResult} with the results of the request
* @throws ScopeResolverException if there is an error resolving the resource identifier to a scope.
*/
- public ScopeResolverResult resolveScope(Attribute attributeResourceId, ScopeQualifier scopeQualifier)
+ ScopeResolverResult resolveScope(Attribute attributeResourceId, ScopeQualifier scopeQualifier)
throws ScopeResolverException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolverResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolverResult.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolverResult.java
index e651ba0..5bfa57a 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolverResult.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/ScopeResolverResult.java
@@ -44,7 +44,7 @@ public interface ScopeResolverResult {
* Gets the {@link com.att.research.xacml.api.Status} for the scope resolution request.
* @return the <code>Status</code> of the scope resolution request
*/
- public Status getStatus();
+ Status getStatus();
/*
* Gets an <code>Iterator</code> over {@link com.att.research.xacml.api.Attribute}s resolved from a scope
@@ -52,5 +52,5 @@ public interface ScopeResolverResult {
* @return an <code>Iterator</code> over the <code>Attribute</code>s resolved from a scope resolution
* request.
*/
- public Iterator<Attribute> getAttributes();
+ Iterator<Attribute> getAttributes();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pep/PEPEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pep/PEPEngine.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pep/PEPEngine.java
index 9b14338..d8eb14c 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pep/PEPEngine.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pep/PEPEngine.java
@@ -46,5 +46,5 @@ public interface PEPEngine {
* @param pepRequest the <code>Request</code> to evaluate
* @return a {@link com.att.research.xacml.api.Response} indicating the decision
*/
- public Response decide(Request pepRequest) throws PEPException;
+ Response decide(Request pepRequest) throws PEPException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPEngine.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPEngine.java
index 1aa28fe..87a686a 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPEngine.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPEngine.java
@@ -43,28 +43,28 @@ public interface PIPEngine {
*
* @return the <code>String</code> name of this <code>PIPEngine</code>>
*/
- public String getName();
+ String getName();
/**
* Gets the <code>String</code> description of this <code>PIPEngine</code>.
*
* @return the <code>String</code> description of this <code>PIPEngine</code>.
*/
- public String getDescription();
+ String getDescription();
/**
* Returns a list of PIPRequests required by the Engine to return an attribute(s).
*
* @return Collection of required attributes
*/
- public Collection<PIPRequest> attributesRequired();
+ Collection<PIPRequest> attributesRequired();
/**
* Returns a list of PIPRequest objects that the Engine can return.
*
* @return Collection of provided attributes
*/
- public Collection<PIPRequest> attributesProvided();
+ Collection<PIPRequest> attributesProvided();
/**
* Retrieves <code>Attribute</code>s that match the given
@@ -79,5 +79,5 @@ public interface PIPEngine {
* @return a {@link com.att.research.xacml.pip.PIPResponse} with the results of the request
* @throws PIPException if there is an error retrieving the <code>Attribute</code>s.
*/
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPFinder pipFinder) throws PIPException;
+ PIPResponse getAttributes(PIPRequest pipRequest, PIPFinder pipFinder) throws PIPException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPFinder.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPFinder.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPFinder.java
index 10e0543..f91cd6a 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPFinder.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPFinder.java
@@ -51,7 +51,7 @@ public interface PIPFinder {
* @return a {@link com.att.research.xacml.pip.PIPResponse} with the results of the request
* @throws PIPException if there is an error retrieving the <code>Attribute</code>s.
*/
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
+ PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
/**
* Retrieves <code>Attribute</code>s that match the given
@@ -67,7 +67,7 @@ public interface PIPFinder {
* @return a {@link com.att.research.xacml.pip.PIPResponse} with the results of the request
* @throws PIPException if there is an error retrieving the <code>Attribute</code>s.
*/
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
+ PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException;
/**
* Retrieves <code>Attribute</code>s that based on the given <code>PIPRequest</code> as above. If the
@@ -81,7 +81,7 @@ public interface PIPFinder {
* @return
* @throws PIPException
*/
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
+ PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
throws PIPException;
/**
@@ -96,8 +96,8 @@ public interface PIPFinder {
* @return
* @throws PIPException
*/
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude,
+ PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude,
PIPFinder pipFinderParent) throws PIPException;
- public Collection<PIPEngine> getPIPEngines();
+ Collection<PIPEngine> getPIPEngines();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPRequest.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPRequest.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPRequest.java
index dd23822..a3622f7 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPRequest.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPRequest.java
@@ -42,21 +42,21 @@ public interface PIPRequest {
*
* @return the <code>Identifier</code> for the category of the attributes to retrieve
*/
- public Identifier getCategory();
+ Identifier getCategory();
/**
* Gets the <code>Identifier</code> of the attributes to retrieve.
*
* @return the <code>Identifier</code> of the attributes to retrieve.
*/
- public Identifier getAttributeId();
+ Identifier getAttributeId();
/**
* Gets the <code>Identifier</code> of the requested data type for attribute values.
*
* @return the <code>Identifier</code> of the requested data type for attribute values
*/
- public Identifier getDataTypeId();
+ Identifier getDataTypeId();
/**
* Gets the <code>String</code> issuer identifier for the attributes to retrieve.
@@ -64,6 +64,6 @@ public interface PIPRequest {
* @return the <code>String</code> issuer identifier for the attributes to retrieve or null if there is no
* requirement to match the issuer.
*/
- public String getIssuer();
+ String getIssuer();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPResponse.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPResponse.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPResponse.java
index d6d87b1..65be56b 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPResponse.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pip/PIPResponse.java
@@ -45,7 +45,7 @@ public interface PIPResponse {
*
* @return the <code>Status</code> of the request to retrieve attributes from a <code>PIPEngine</code>
*/
- public Status getStatus();
+ Status getStatus();
/**
* Gets the <code>Collection</code> of {@link com.att.research.xacml.api.Attribute}s returned from a
@@ -55,7 +55,7 @@ public interface PIPResponse {
* @return The <code>Collection</code> of <code>Attribute</code>s returned or an empty list if none are
* found
*/
- public Collection<Attribute> getAttributes();
+ Collection<Attribute> getAttributes();
/**
* Determines if this <code>PIPResponse</code> is simple or not. A simple <code>PIPResponse</code>
@@ -64,5 +64,5 @@ public interface PIPResponse {
*
* @return true if this <code>PIPResponse</code> is simple, else false.
*/
- public boolean isSimple();
+ boolean isSimple();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEngine.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEngine.java
index 987f9d7..6d3a4c1 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEngine.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEngine.java
@@ -41,7 +41,7 @@ public interface TraceEngine {
*
* @param traceEvent the <code>TraceEvent</code> to process
*/
- public void trace(TraceEvent<?> traceEvent);
+ void trace(TraceEvent<?> traceEvent);
/**
* Returns true if this <code>TraceEngine</code> would actually process a {@link TraceEvent}. This is
@@ -49,5 +49,5 @@ public interface TraceEngine {
*
* @return true if this <code>TraceEngine</code> would perform an action on a <code>TraceEvent</code>.
*/
- public boolean isTracing();
+ boolean isTracing();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEvent.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEvent.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEvent.java
index 2af6ff2..8bbdaae 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEvent.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/TraceEvent.java
@@ -45,7 +45,7 @@ public interface TraceEvent<T> {
*
* @return the timestamp as a <code>Date</code> when this <code>TraceEvent</code> occurred.
*/
- public Date getTimestamp();
+ Date getTimestamp();
/**
* Gets the <code>String</code> message associated with this <code>TraceEvent</code>. If there is no
@@ -53,19 +53,19 @@ public interface TraceEvent<T> {
*
* @return the <code>String</code> message associated with this <code>TraceEvent</code>.
*/
- public String getMessage();
+ String getMessage();
/**
* Gets the {@link Traceable} that created this <code>TraceEvent</code>
*
* @return the <code>Traceable</code> that created this <code>TraceEvent</code>.
*/
- public Traceable getCause();
+ Traceable getCause();
/**
* Gets the <code>T</code> object representing the value of this <code>TraceEvent</code>.
*
* @return the <code>T</code> object representing the value of this <code>TraceEvent</code>.
*/
- public T getValue();
+ T getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/Traceable.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/Traceable.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/Traceable.java
index a09b0dc..9e44885 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/Traceable.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/trace/Traceable.java
@@ -44,7 +44,7 @@ public interface Traceable {
*
* @return the <code>String</code> identifier for the object that caused the <code>TraceEvent</code>.
*/
- public String getTraceId();
+ String getTraceId();
/**
* Gets the <code>Traceable</code> that caused the evaluation method on this <code>Traceable</code> to be
@@ -53,5 +53,5 @@ public interface Traceable {
* @return the <code>Traceable</code> that caused the evaluation method on this <code>Traceable</code> to
* be called.
*/
- public Traceable getCause();
+ Traceable getCause();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/std/pap/StdPDPStatus.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/std/pap/StdPDPStatus.java b/openaz-xacml/src/main/java/com/att/research/xacml/std/pap/StdPDPStatus.java
index 784de69..862097f 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/std/pap/StdPDPStatus.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/std/pap/StdPDPStatus.java
@@ -216,39 +216,49 @@ public class StdPDPStatus implements Serializable, PDPStatus {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (failedPIPConfigs.hashCode());
- result = prime * result + (failedPolicies.hashCode());
- result = prime * result + (loadErrors.hashCode());
- result = prime * result + (loadWarnings.hashCode());
- result = prime * result + (loadedPIPConfigs.hashCode());
- result = prime * result + (loadedPolicies.hashCode());
- result = prime * result + (status.hashCode());
+ result = prime * result + failedPIPConfigs.hashCode();
+ result = prime * result + failedPolicies.hashCode();
+ result = prime * result + loadErrors.hashCode();
+ result = prime * result + loadWarnings.hashCode();
+ result = prime * result + loadedPIPConfigs.hashCode();
+ result = prime * result + loadedPolicies.hashCode();
+ result = prime * result + status.hashCode();
return result;
}
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
StdPDPStatus other = (StdPDPStatus)obj;
- if (!failedPIPConfigs.equals(other.failedPIPConfigs))
+ if (!failedPIPConfigs.equals(other.failedPIPConfigs)) {
return false;
- if (!failedPolicies.equals(other.failedPolicies))
+ }
+ if (!failedPolicies.equals(other.failedPolicies)) {
return false;
- if (!loadErrors.equals(other.loadErrors))
+ }
+ if (!loadErrors.equals(other.loadErrors)) {
return false;
- if (!loadWarnings.equals(other.loadWarnings))
+ }
+ if (!loadWarnings.equals(other.loadWarnings)) {
return false;
- if (!loadedPIPConfigs.equals(other.loadedPIPConfigs))
+ }
+ if (!loadedPIPConfigs.equals(other.loadedPIPConfigs)) {
return false;
- if (!loadedPolicies.equals(other.loadedPolicies))
+ }
+ if (!loadedPolicies.equals(other.loadedPolicies)) {
return false;
- if (status != other.status)
+ }
+ if (status != other.status) {
return false;
+ }
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/ListUtil.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/ListUtil.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/ListUtil.java
index a2c60d8..ab8fa5e 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/ListUtil.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/ListUtil.java
@@ -58,7 +58,7 @@ public class ListUtil {
public static <T> boolean equalsAllowNulls(Iterator<T> iterator1, Iterator<T> iterator2) {
if (iterator1 == null || !iterator1.hasNext()) {
- return (iterator2 == null || !iterator2.hasNext());
+ return iterator2 == null || !iterator2.hasNext();
} else if (iterator2 == null || !iterator2.hasNext()) {
return false;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/ObjUtil.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/ObjUtil.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/ObjUtil.java
index 778da3d..af316f2 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/ObjUtil.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/ObjUtil.java
@@ -56,10 +56,9 @@ public class ObjUtil {
*/
public static <T> boolean equalsAllowNull(T obj1, T obj2) {
if (obj1 == null) {
- return (obj2 == null);
- } else {
- return obj1.equals(obj2);
+ return obj2 == null;
}
+ return obj1.equals(obj2);
}
/**
@@ -78,7 +77,7 @@ public class ObjUtil {
*/
public static boolean xmlEqualsAllowNull(Node node1, Node node2) {
if (node1 == null) {
- return (node2 == null);
+ return node2 == null;
} else if (node2 == null) {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/StringUtils.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/StringUtils.java
index 1086177..814b5a1 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/StringUtils.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/StringUtils.java
@@ -50,7 +50,7 @@ public class StringUtils {
* <code>Iterator</code> is null (or empty if allowEmptyLists is false)
*/
public static String toString(Iterator<?> iterObjects, boolean allowEmptyLists) {
- if (iterObjects == null || (!allowEmptyLists && !iterObjects.hasNext())) {
+ if (iterObjects == null || !allowEmptyLists && !iterObjects.hasNext()) {
return null;
} else {
StringBuilder stringBuilder = new StringBuilder("[");
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyAggregator.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyAggregator.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyAggregator.java
index 3c1ed90..ed78a1b 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyAggregator.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyAggregator.java
@@ -48,10 +48,8 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ApplyType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeSelectorType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ConditionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType;
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.FunctionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType;
@@ -149,7 +147,7 @@ public class XACMLPolicyAggregator extends SimpleCallback {
// Are there any actual values in it?
//
Object val = value.getValue();
- if (val == null || (val instanceof Collection && ((Collection<?>)val).isEmpty())) {
+ if (val == null || val instanceof Collection && ((Collection<?>)val).isEmpty()) {
if (logger.isDebugEnabled()) {
logger.debug("No actual attribute values: " + attribute.getAttributeId() + " "
+ value.getDataTypeId());
@@ -267,14 +265,14 @@ public class XACMLPolicyAggregator extends SimpleCallback {
Collections.emptyList()),
designator.getIssuer(), false);
this.onAttribute(parent, container, attribute);
- } else if (obj instanceof AttributeValueType) {
- /*
+ } /* else if (obj instanceof AttributeValueType) {
+
* Highly unlikely that we would get this at the top level of a condition or variable
* AttributeValueType value = (AttributeValueType) obj;
* System.out.println("AttributeValueType datatype=" + value.getDataType());
* System.out.println("AttributeValueType content=" + value.getContent());
- */
- } else if (obj instanceof VariableReferenceType) {
+
+ } */ else if (obj instanceof VariableReferenceType) {
if (this.variableReferences == null) {
this.variableReferences = new ArrayList<VariableReferenceType>();
}
@@ -286,12 +284,11 @@ public class XACMLPolicyAggregator extends SimpleCallback {
this.evaluteExpression(element.getValue(), parent, container);
}
}
- } else if (obj instanceof FunctionType) {
- /*
+ } /*else if (obj instanceof FunctionType) {
+
* Highly unlikely that we would get this at the top level of a condition or variable FunctionType
* function = (FunctionType) obj; System.out.println("FunctionType=" + function.getFunctionId());
- */
- } else if (obj instanceof AttributeSelectorType) {
+ } */ else if (obj instanceof AttributeSelectorType) {
AttributeSelectorType selector = (AttributeSelectorType)obj;
StdAttribute attribute = new StdAttribute(
new IdentifierImpl(selector.getCategory()),
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyScanner.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyScanner.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyScanner.java
index d23946b..d01e274 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyScanner.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLPolicyScanner.java
@@ -112,14 +112,14 @@ public class XACMLPolicyScanner {
* @param root - The root PolicySet/Policy object.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onBeginScan(Object root);
+ CallbackResult onBeginScan(Object root);
/**
* Called when the scanning finishes with the root element.
*
* @param root - The root PolicySet/Policy object.
*/
- public void onFinishScan(Object root);
+ void onFinishScan(Object root);
/**
* Called when the scanning of the policy first encounters a PolicySet
@@ -128,7 +128,7 @@ public class XACMLPolicyScanner {
* @param policySet - The PolicySet object.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPreVisitPolicySet(PolicySetType parent, PolicySetType policySet);
+ CallbackResult onPreVisitPolicySet(PolicySetType parent, PolicySetType policySet);
/**
* Called when the scanning of the PolicySet has finished.
@@ -137,7 +137,7 @@ public class XACMLPolicyScanner {
* @param policySet - The PolicySet object.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPostVisitPolicySet(PolicySetType parent, PolicySetType policySet);
+ CallbackResult onPostVisitPolicySet(PolicySetType parent, PolicySetType policySet);
/**
* Called when the scanning of the policy first encounters a Policy
@@ -146,7 +146,7 @@ public class XACMLPolicyScanner {
* @param policy - The policy.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPreVisitPolicy(PolicySetType parent, PolicyType policy);
+ CallbackResult onPreVisitPolicy(PolicySetType parent, PolicyType policy);
/**
* Called when the scanning of the Policy has finished.
@@ -155,7 +155,7 @@ public class XACMLPolicyScanner {
* @param policy - The policy.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPostVisitPolicy(PolicySetType parent, PolicyType policy);
+ CallbackResult onPostVisitPolicy(PolicySetType parent, PolicyType policy);
/**
* Called when the scanning of the policy first encounters a Rule
@@ -164,7 +164,7 @@ public class XACMLPolicyScanner {
* @param rule - The rule
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPreVisitRule(PolicyType parent, RuleType rule);
+ CallbackResult onPreVisitRule(PolicyType parent, RuleType rule);
/**
* Called when the scanning of the Rule has finished.
@@ -173,7 +173,7 @@ public class XACMLPolicyScanner {
* @param rule - The rule
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPostVisitRule(PolicyType parent, RuleType rule);
+ CallbackResult onPostVisitRule(PolicyType parent, RuleType rule);
/**
* When an attribute has been encountered.
@@ -184,7 +184,7 @@ public class XACMLPolicyScanner {
* @param attribute - The attribute
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onAttribute(Object parent, Object container, Attribute attribute);
+ CallbackResult onAttribute(Object parent, Object container, Attribute attribute);
/**
* When an obligation has been encountered.
@@ -193,7 +193,7 @@ public class XACMLPolicyScanner {
* @param obligation - The obligation.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onObligation(Object parent, ObligationExpressionType expression,
+ CallbackResult onObligation(Object parent, ObligationExpressionType expression,
Obligation obligation);
/**
@@ -203,7 +203,7 @@ public class XACMLPolicyScanner {
* @param advice - The advice.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onAdvice(Object parent, AdviceExpressionType expression, Advice advice);
+ CallbackResult onAdvice(Object parent, AdviceExpressionType expression, Advice advice);
/**
* When a variable definition has been encountered.
@@ -212,7 +212,7 @@ public class XACMLPolicyScanner {
* @param variable - The variable.
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onVariable(PolicyType policy, VariableDefinitionType variable);
+ CallbackResult onVariable(PolicyType policy, VariableDefinitionType variable);
/**
* When a condition has been encountered.
@@ -221,7 +221,7 @@ public class XACMLPolicyScanner {
* @param condition - The condition
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onCondition(RuleType rule, ConditionType condition);
+ CallbackResult onCondition(RuleType rule, ConditionType condition);
/**
* When a reference to another PolicySet is encountered.
@@ -230,7 +230,7 @@ public class XACMLPolicyScanner {
* @param parent - The parent PolicySet that holds the reference
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPolicySetIdReference(IdReferenceType reference, PolicySetType parent);
+ CallbackResult onPolicySetIdReference(IdReferenceType reference, PolicySetType parent);
/**
* When a reference to another PolicySet is encountered.
@@ -239,7 +239,7 @@ public class XACMLPolicyScanner {
* @param parent - The parent PolicySet that holds the reference
* @return CallbackResult - CONTINUE or STOP scanning the policy.
*/
- public CallbackResult onPolicyIdReference(IdReferenceType reference, PolicySetType parent);
+ CallbackResult onPolicyIdReference(IdReferenceType reference, PolicySetType parent);
}
/**
@@ -385,10 +385,9 @@ public class XACMLPolicyScanner {
if (this.policyObject == null) {
return null;
}
- if (this.callback != null) {
- if (this.callback.onBeginScan(this.policyObject) == CallbackResult.STOP) {
- return this.policyObject;
- }
+ if (this.callback != null
+ && this.callback.onBeginScan(this.policyObject) == CallbackResult.STOP) {
+ return this.policyObject;
}
if (this.policyObject instanceof PolicyType) {
this.scanPolicy(null, (PolicyType)this.policyObject);
@@ -420,10 +419,9 @@ public class XACMLPolicyScanner {
logger.trace("scanning policy set: " + policySet.getPolicySetId() + " "
+ policySet.getDescription());
}
- if (this.callback != null) {
- if (this.callback.onPreVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPreVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
//
// Scan its info
@@ -450,21 +448,20 @@ public class XACMLPolicyScanner {
if (this.scanPolicy(policySet, (PolicyType)element.getValue()) == CallbackResult.STOP) {
return CallbackResult.STOP;
}
- } else if (element.getValue() instanceof IdReferenceType) {
- if (element.getName().getLocalPart().equals("PolicySetIdReference")) {
+ } else if (element.getValue() instanceof IdReferenceType) { //NOPMD
+ /*TODO if (element.getName().getLocalPart().equals("PolicySetIdReference")) {
} else if (element.getName().getLocalPart().equals("PolicyIdReference")) {
- }
+ }*/
} else {
logger.warn("generating policy sets found unsupported element: "
+ element.getName().getNamespaceURI());
}
}
- if (this.callback != null) {
- if (this.callback.onPostVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPostVisitPolicySet(parent, policySet) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
return CallbackResult.CONTINUE;
}
@@ -480,10 +477,9 @@ public class XACMLPolicyScanner {
if (logger.isTraceEnabled()) {
logger.trace("scanning policy: " + policy.getPolicyId() + " " + policy.getDescription());
}
- if (this.callback != null) {
- if (this.callback.onPreVisitPolicy(parent, policy) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPreVisitPolicy(parent, policy) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
//
// Scan its info
@@ -511,10 +507,9 @@ public class XACMLPolicyScanner {
if (logger.isTraceEnabled()) {
logger.trace("scanning rule: " + rule.getRuleId() + " " + rule.getDescription());
}
- if (this.callback != null) {
- if (this.callback.onPreVisitRule(policy, rule) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPreVisitRule(policy, rule) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
if (this.scanTarget(rule, rule.getTarget()) == CallbackResult.STOP) {
return CallbackResult.STOP;
@@ -528,16 +523,14 @@ public class XACMLPolicyScanner {
if (this.scanAdvice(rule, rule.getAdviceExpressions()) == CallbackResult.STOP) {
return CallbackResult.STOP;
}
- if (this.callback != null) {
- if (this.callback.onPostVisitRule(policy, rule) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPostVisitRule(policy, rule) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
} else if (o instanceof VariableDefinitionType) {
- if (this.callback != null) {
- if (this.callback.onVariable(policy, (VariableDefinitionType)o) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onVariable(policy, (VariableDefinitionType)o) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
} else {
if (logger.isDebugEnabled()) {
@@ -545,10 +538,9 @@ public class XACMLPolicyScanner {
}
}
}
- if (this.callback != null) {
- if (this.callback.onPostVisitPolicy(parent, policy) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onPostVisitPolicy(parent, policy) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
return CallbackResult.CONTINUE;
}
@@ -616,10 +608,9 @@ public class XACMLPolicyScanner {
} else {
logger.warn("NULL designator/selector or value for match.");
}
- if (attribute != null && this.callback != null) {
- if (this.callback.onAttribute(parent, target, attribute) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (attribute != null && this.callback != null
+ && this.callback.onAttribute(parent, target, attribute) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
}
}
@@ -670,10 +661,9 @@ public class XACMLPolicyScanner {
ob.addAttributeAssignment(attribute);
}
}
- if (this.callback != null) {
- if (this.callback.onObligation(parent, expression, ob) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onObligation(parent, expression, ob) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
}
return CallbackResult.CONTINUE;
@@ -715,10 +705,9 @@ public class XACMLPolicyScanner {
ob.addAttributeAssignment(attribute);
}
}
- if (this.callback != null) {
- if (this.callback.onAdvice(parent, expression, ob) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
+ if (this.callback != null
+ && this.callback.onAdvice(parent, expression, ob) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
}
return CallbackResult.CONTINUE;
@@ -736,12 +725,9 @@ public class XACMLPolicyScanner {
return CallbackResult.CONTINUE;
}
for (Object o : list) {
- if (o instanceof VariableDefinitionType) {
- if (this.callback != null) {
- if (this.callback.onVariable(policy, (VariableDefinitionType)o) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
- }
+ if (o instanceof VariableDefinitionType && this.callback != null
+ && this.callback.onVariable(policy, (VariableDefinitionType)o) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
}
@@ -756,12 +742,9 @@ public class XACMLPolicyScanner {
* @return
*/
protected CallbackResult scanConditions(RuleType rule, ConditionType condition) {
- if (condition != null) {
- if (this.callback != null) {
- if (this.callback.onCondition(rule, condition) == CallbackResult.STOP) {
- return CallbackResult.STOP;
- }
- }
+ if (condition != null && this.callback != null
+ && this.callback.onCondition(rule, condition) == CallbackResult.STOP) {
+ return CallbackResult.STOP;
}
return CallbackResult.CONTINUE;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLProperties.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLProperties.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLProperties.java
index 3953e7c..452d426 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLProperties.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLProperties.java
@@ -123,16 +123,18 @@ public class XACMLProperties {
try {
properties = getProperties();
value = properties.getProperty(propertyName);
- } catch (Exception ex) {
+ } catch (IOException ex) {
+ logger.debug("Error getting property: " + propertyName, ex);
}
}
- return (value == null ? defaultValue : value);
+ return value == null ? defaultValue : value;
}
public static void setProperty(String propertyName, String propertyValue) {
try {
getProperties().setProperty(propertyName, propertyValue);
- } catch (Exception ex) {
+ } catch (IOException ex) {
+ logger.debug("Error setting property: " + propertyName, ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/14caf306/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLRepair.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLRepair.java b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLRepair.java
index cc92af2..2b8e00b 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLRepair.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/util/XACMLRepair.java
@@ -226,8 +226,6 @@ public class XACMLRepair {
this.outputFileOrDirectory.delete();
}
}
- } else {
-
}
}
@@ -279,7 +277,6 @@ public class XACMLRepair {
System.err.println("Exception: " + ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
- ;
}
System.exit(0);
}