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/07 12:19:36 UTC
[1/2] incubator-openaz git commit: [OPENAZ-2] - More PMD work
Repository: incubator-openaz
Updated Branches:
refs/heads/master aba0d5e7a -> fbf04a938
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHigherOrderBag.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
index 99e0c1c..553b9a3 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHigherOrderBag.java
@@ -167,15 +167,13 @@ public class FunctionDefinitionHigherOrderBag<O, I> extends FunctionDefinitionBa
+ "'"));
}
// in all cases except MAP, the predicate must return True/False
- if (operation != OPERATION.MAP) {
- if (!predicate.getDataTypeId().equals(DataTypes.DT_BOOLEAN.getId())) {
- return ExpressionResult
- .newError(new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
- this.getShortFunctionId()
- + " Predicate Function must return boolean, but '"
- + predicate.getId() + "' returns '"
- + this.getShortDataTypeId(predicate.getDataTypeId())));
- }
+ if (operation != OPERATION.MAP && !predicate.getDataTypeId().equals(DataTypes.DT_BOOLEAN.getId())) {
+ return ExpressionResult
+ .newError(new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
+ this.getShortFunctionId()
+ + " Predicate Function must return boolean, but '"
+ + predicate.getId() + "' returns '"
+ + this.getShortDataTypeId(predicate.getDataTypeId())));
}
// The remaining arguments may be either bags or primitive types.
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
index 2b52b14..ed99186 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionHomogeneousSimple.java
@@ -143,8 +143,8 @@ public abstract class FunctionDefinitionHomogeneousSimple<O, I> extends Function
/*
* See if we have to validate the number of arguments
*/
- if ((listFunctionArguments == null && this.numArgs > 0)
- || (listFunctionArguments != null && this.numArgs != listFunctionArguments.size())) {
+ if (listFunctionArguments == null && this.numArgs > 0
+ || listFunctionArguments != null && this.numArgs != listFunctionArguments.size()) {
return new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
"Expected " + this.numArgs + " arguments, got "
+ ((listFunctionArguments == null) ? 0 : listFunctionArguments.size()));
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionLogical.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionLogical.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionLogical.java
index 5d26860..4b0db58 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionLogical.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionLogical.java
@@ -192,7 +192,7 @@ public class FunctionDefinitionLogical extends FunctionDefinitionHomogeneousSimp
if (!argument.isOk()) {
return ExpressionResult.newError(getFunctionStatus(argument.getStatus()));
}
- if ((argument.getValue()) == true) {
+ if (argument.getValue()) {
trueArgumentsSeen++;
if (trueArgumentsSeen >= argumentCountNeeded) {
return ER_TRUE;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionSet.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionSet.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionSet.java
index 6490c89..a5c1b93 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionSet.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionSet.java
@@ -82,8 +82,8 @@ public class FunctionDefinitionSet<O, I> extends FunctionDefinitionBase<O, I> {
*/
public FunctionDefinitionSet(Identifier idIn, DataType<O> dataTypeIn, DataType<I> dataTypeArgsIn,
OPERATION opIn) {
- super(idIn, dataTypeIn, dataTypeArgsIn, ((opIn == OPERATION.INTERSECTION || opIn == OPERATION.UNION)
- ? true : false));
+ super(idIn, dataTypeIn, dataTypeArgsIn, opIn == OPERATION.INTERSECTION || opIn == OPERATION.UNION
+ ? true : false);
operation = opIn;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctions.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctions.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctions.java
index 8a3dcdc..76e57e3 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctions.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionStringFunctions.java
@@ -94,15 +94,15 @@ public class FunctionDefinitionStringFunctions<O, I> extends FunctionDefinitionB
public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments) {
if (arguments == null
- || (operation == OPERATION.CONCATENATE && arguments.size() < 2)
- || (operation == OPERATION.SUBSTRING && arguments.size() != 3)
- || (operation != OPERATION.SUBSTRING && operation != OPERATION.CONCATENATE && arguments.size() != 2)) {
+ || operation == OPERATION.CONCATENATE && arguments.size() < 2
+ || operation == OPERATION.SUBSTRING && arguments.size() != 3
+ || operation != OPERATION.SUBSTRING && operation != OPERATION.CONCATENATE && arguments.size() != 2) {
return ExpressionResult.newError(new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
this.getShortFunctionId()
+ " Expected "
- + ((operation == OPERATION.SUBSTRING)
- ? 3 : (operation == OPERATION.CONCATENATE
- ? "2 or more " : 2))
+ + (operation == OPERATION.SUBSTRING
+ ? 3 : operation == OPERATION.CONCATENATE
+ ? "2 or more " : 2)
+ " arguments, got "
+ ((arguments == null) ? "null" : arguments
.size())));
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionXPath.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionXPath.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionXPath.java
index 7a13da4..ca5849f 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionXPath.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionXPath.java
@@ -171,7 +171,7 @@ public class FunctionDefinitionXPath<O> extends
if (operation == OPERATION.COUNT) {
return ExpressionResult
.newSingle(new StdAttributeValue<BigInteger>(XACML.ID_DATATYPE_INTEGER,
- new BigInteger("0")));
+ BigInteger.ZERO));
} else {
return ER_FALSE;
}
[2/2] incubator-openaz git commit: [OPENAZ-2] - More PMD work
Posted by co...@apache.org.
[OPENAZ-2] - More PMD work
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/fbf04a93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/fbf04a93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/fbf04a93
Branch: refs/heads/master
Commit: fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b
Parents: aba0d5e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu May 7 11:17:17 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu May 7 11:17:17 2015 +0100
----------------------------------------------------------------------
.../rest/impl/XACMLPdpPolicyFinderFactory.java | 6 +-
.../att/research/xacmlatt/pdp/ATTPDPEngine.java | 2 +-
.../research/xacmlatt/pdp/eval/Evaluatable.java | 2 +-
.../xacmlatt/pdp/eval/EvaluationContext.java | 10 +-
.../research/xacmlatt/pdp/eval/Matchable.java | 2 +-
.../xacmlatt/pdp/policy/AdviceExpression.java | 3 -
.../att/research/xacmlatt/pdp/policy/AllOf.java | 4 +-
.../att/research/xacmlatt/pdp/policy/AnyOf.java | 2 +-
.../pdp/policy/AttributeAssignmentResult.java | 2 +-
.../xacmlatt/pdp/policy/CombiningAlgorithm.java | 4 +-
.../research/xacmlatt/pdp/policy/Condition.java | 2 +-
.../xacmlatt/pdp/policy/ExpressionResult.java | 2 +-
.../xacmlatt/pdp/policy/FunctionArgument.java | 10 +-
.../xacmlatt/pdp/policy/FunctionDefinition.java | 8 +-
.../att/research/xacmlatt/pdp/policy/Match.java | 10 +-
.../research/xacmlatt/pdp/policy/Policy.java | 8 +-
.../xacmlatt/pdp/policy/PolicyDefaults.java | 2 +-
.../xacmlatt/pdp/policy/PolicyFinder.java | 6 +-
.../xacmlatt/pdp/policy/PolicyFinderResult.java | 4 +-
.../research/xacmlatt/pdp/policy/PolicySet.java | 8 +-
.../att/research/xacmlatt/pdp/policy/Rule.java | 2 +-
.../policy/TargetedCombinerParameterMap.java | 31 ++-
.../xacmlatt/pdp/policy/dom/DOMAnyOf.java | 4 +-
.../xacmlatt/pdp/policy/dom/DOMApply.java | 3 +-
.../dom/DOMAttributeAssignmentExpression.java | 1 -
.../xacmlatt/pdp/policy/dom/DOMExpression.java | 4 +-
.../xacmlatt/pdp/policy/dom/DOMPolicy.java | 211 +++++++++----------
.../pdp/policy/dom/DOMPolicyIssuer.java | 48 ++---
.../pdp/policy/dom/DOMPolicyRepair.java | 1 -
.../xacmlatt/pdp/policy/dom/DOMPolicySet.java | 3 +-
.../policy/expressions/AttributeDesignator.java | 4 +-
.../policy/expressions/AttributeSelector.java | 2 +-
.../pdp/std/StdCombiningAlgorithmFactory.java | 4 +-
.../pdp/std/StdFunctionDefinitionFactory.java | 4 +-
.../xacmlatt/pdp/std/StdPolicyFinder.java | 12 +-
.../std/combiners/CombinedPermitOverrides.java | 2 +-
.../pdp/std/combiners/DenyOverrides.java | 2 +-
.../pdp/std/combiners/DenyUnlessPermit.java | 2 +-
.../pdp/std/combiners/FirstApplicable.java | 2 +-
.../combiners/LegacyDenyOverridesPolicy.java | 2 +-
.../std/combiners/LegacyDenyOverridesRule.java | 2 +-
.../combiners/LegacyPermitOverridesPolicy.java | 2 +-
.../combiners/LegacyPermitOverridesRule.java | 2 +-
.../pdp/std/combiners/PermitOverrides.java | 2 +-
.../pdp/std/combiners/PermitUnlessDeny.java | 2 +-
.../functions/FunctionDefinitionArithmetic.java | 4 +-
.../FunctionDefinitionBagOneAndOnly.java | 2 +-
.../FunctionDefinitionHigherOrderBag.java | 16 +-
.../FunctionDefinitionHomogeneousSimple.java | 4 +-
.../functions/FunctionDefinitionLogical.java | 2 +-
.../std/functions/FunctionDefinitionSet.java | 4 +-
.../FunctionDefinitionStringFunctions.java | 12 +-
.../std/functions/FunctionDefinitionXPath.java | 2 +-
53 files changed, 242 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java b/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
index 8b6ba6c..282b8a2 100644
--- a/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
+++ b/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/impl/XACMLPdpPolicyFinderFactory.java
@@ -216,12 +216,14 @@ public class XACMLPdpPolicyFinderFactory extends PolicyFinderFactory {
//
// Force using any properties that were passed upon construction
//
- return new StdPolicyFinder(this.rootPolicies, this.referencedPolicies, this.properties);
+ // TODO properties are not used in StdPolicyFinder
+ return new StdPolicyFinder(this.rootPolicies, this.referencedPolicies);
}
@Override
public PolicyFinder getPolicyFinder(Properties properties) throws FactoryException {
- return new StdPolicyFinder(this.rootPolicies, this.referencedPolicies, properties);
+ // TODO properties are not used in StdPolicyFinder
+ return new StdPolicyFinder(this.rootPolicies, this.referencedPolicies);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/ATTPDPEngine.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/ATTPDPEngine.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/ATTPDPEngine.java
index fd8dedd..0e95682 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/ATTPDPEngine.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/ATTPDPEngine.java
@@ -237,7 +237,7 @@ public class ATTPDPEngine implements PDPEngine, Traceable {
}
}
- assert (resultIndividualDecision != null);
+ assert resultIndividualDecision != null;
if (traceEngineThis.isTracing()) {
traceEngineThis.trace(new StdTraceEvent<Result>("Individual Result", this,
resultIndividualDecision));
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Evaluatable.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Evaluatable.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Evaluatable.java
index bc9f7e8..17e2ed7 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Evaluatable.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Evaluatable.java
@@ -37,5 +37,5 @@ package com.att.research.xacmlatt.pdp.eval;
* {@link com.att.research.xacmlatt.pdp.eval.EvaluationResult}.
*/
public interface Evaluatable {
- public EvaluationResult evaluate(EvaluationContext evaluationContext) throws EvaluationException;
+ EvaluationResult evaluate(EvaluationContext evaluationContext) throws EvaluationException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/EvaluationContext.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/EvaluationContext.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/EvaluationContext.java
index 81f8a9e..92dde90 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/EvaluationContext.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/EvaluationContext.java
@@ -54,7 +54,7 @@ public interface EvaluationContext extends PIPFinder, TraceEngine {
* @return the <code>Request</code> provided to the <code>ATTPDPEngine</code>'s <code>decide</code>
* method.
*/
- public Request getRequest();
+ Request getRequest();
/**
* Gets the root {@link com.att.research.xacmlatt.pdp.policy.PolicyDef} from the policy store configured
@@ -62,7 +62,7 @@ public interface EvaluationContext extends PIPFinder, TraceEngine {
*
* @return a <code>PolicyFinderResult</code> with the root <code>PolicyDef</code>
*/
- public abstract PolicyFinderResult<PolicyDef> getRootPolicyDef();
+ PolicyFinderResult<PolicyDef> getRootPolicyDef();
/**
* Gets the {@link com.att.research.xacmlatt.pdp.policy.Policy} that matches the given
@@ -72,7 +72,7 @@ public interface EvaluationContext extends PIPFinder, TraceEngine {
* @return a <code>PolicyFinderResult</code> with the <code>Policy</code> matching the given
* <code>IdReferenceMatch</code>
*/
- public abstract PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
+ PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
/**
* Gets the {@link com.att.research.xacmlatt.pdp.policy.PolicySet} that matches the given
@@ -82,7 +82,7 @@ public interface EvaluationContext extends PIPFinder, TraceEngine {
* @return a <code>PolicyFinderResult</code> with the <code>PolicySet</code> matching the given
* <code>IdReferenceMatch</code>.
*/
- public abstract PolicyFinderResult<PolicySet> getPolicySet(IdReferenceMatch idReferenceMatch);
+ PolicyFinderResult<PolicySet> getPolicySet(IdReferenceMatch idReferenceMatch);
/**
* Gets the {@link com.att.research.xacml.api.pip.PIPResponse} containing
@@ -94,5 +94,5 @@ public interface EvaluationContext extends PIPFinder, TraceEngine {
* <code>Attribute</code>s
* @throws EvaluationException if there is an error retrieving the <code>Attribute</code>s
*/
- public PIPResponse getAttributes(PIPRequest pipRequest) throws PIPException;
+ PIPResponse getAttributes(PIPRequest pipRequest) throws PIPException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Matchable.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Matchable.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Matchable.java
index 70890a6..c3db337 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Matchable.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/eval/Matchable.java
@@ -45,5 +45,5 @@ public interface Matchable {
* given <code>EvaluationContext</code>.
* @throws EvaluationException if there is an error testing the match.
*/
- public MatchResult match(EvaluationContext evaluationContext) throws EvaluationException;
+ MatchResult match(EvaluationContext evaluationContext) throws EvaluationException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AdviceExpression.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AdviceExpression.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AdviceExpression.java
index 821043d..723de87 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AdviceExpression.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AdviceExpression.java
@@ -104,9 +104,6 @@ public class AdviceExpression extends PolicyComponent {
public void setAttributeAssignmentExpressions(Collection<AttributeAssignmentExpression> attributeAssignmentExpressions) {
this.clearAttributeAssignmentExpressionList();
- if (attributeAssignmentExpressions != null) {
-
- }
}
public void addAttributeAssignmentExpression(AttributeAssignmentExpression attributeAssignmentExpression) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AllOf.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AllOf.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AllOf.java
index 3b9308b..1456a10 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AllOf.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AllOf.java
@@ -103,12 +103,12 @@ public class AllOf extends PolicyComponent implements Matchable {
return new MatchResult(new StdStatus(this.getStatusCode(), this.getStatusMessage()));
}
Iterator<Match> iterMatches = this.getMatches();
- assert (iterMatches != null && iterMatches.hasNext());
+ assert iterMatches != null && iterMatches.hasNext();
MatchResult matchResultFallThrough = MatchResult.MM_MATCH;
while (iterMatches.hasNext()) {
MatchResult matchResultMatch = iterMatches.next().match(evaluationContext);
- assert (matchResultMatch != null);
+ assert matchResultMatch != null;
switch (matchResultMatch.getMatchCode()) {
case INDETERMINATE:
if (matchResultFallThrough.getMatchCode() != MatchResult.MatchCode.INDETERMINATE) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AnyOf.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AnyOf.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AnyOf.java
index e61b224..1c7b5d9 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AnyOf.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AnyOf.java
@@ -119,7 +119,7 @@ public class AnyOf extends PolicyComponent implements Matchable {
MatchResult matchResultFallThrough = MatchResult.MM_NOMATCH;
while (iterAllOfs.hasNext()) {
MatchResult matchResultAllOf = iterAllOfs.next().match(evaluationContext);
- assert (matchResultAllOf != null);
+ assert matchResultAllOf != null;
switch (matchResultAllOf.getMatchCode()) {
case INDETERMINATE:
/*
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AttributeAssignmentResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AttributeAssignmentResult.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AttributeAssignmentResult.java
index 7f28128..4501638 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AttributeAssignmentResult.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/AttributeAssignmentResult.java
@@ -76,7 +76,7 @@ public class AttributeAssignmentResult {
}
public boolean isOk() {
- return (this.getStatus() == null || this.getStatus().isOk());
+ return this.getStatus() == null || this.getStatus().isOk();
}
public Iterator<AttributeAssignment> getAttributeAssignments() {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/CombiningAlgorithm.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/CombiningAlgorithm.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/CombiningAlgorithm.java
index 9879879..eb1cc61 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/CombiningAlgorithm.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/CombiningAlgorithm.java
@@ -51,7 +51,7 @@ public interface CombiningAlgorithm<T extends Evaluatable> {
*
* @return the <code>Identifier</code> for this <code>CombiningAlgorithm</code>
*/
- public Identifier getId();
+ Identifier getId();
/**
* Evaluates as many of the <code>CombiningElement</code>s supplied with the given
@@ -67,6 +67,6 @@ public interface CombiningAlgorithm<T extends Evaluatable> {
* @throws com.att.research.xacmlatt.pdp.eval.EvaluationException if there is an error in the
* <code>evaluate</code> method of any of the <code>CombiningElement</code>s
*/
- public EvaluationResult combine(EvaluationContext evaluationContext, List<CombiningElement<T>> elements,
+ EvaluationResult combine(EvaluationContext evaluationContext, List<CombiningElement<T>> elements,
List<CombinerParameter> combinerParameters) throws EvaluationException;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java
index 69e551e..7c4a5e2 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Condition.java
@@ -144,7 +144,7 @@ public class Condition extends PolicyComponent {
* Evaluate the expression
*/
ExpressionResult expressionResult = this.getExpression().evaluate(evaluationContext, policyDefaults);
- assert (expressionResult != null);
+ assert expressionResult != null;
if (!expressionResult.isOk()) {
return new ExpressionResultBoolean(expressionResult.getStatus());
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/ExpressionResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/ExpressionResult.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/ExpressionResult.java
index 2f54d29..b73db40 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/ExpressionResult.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/ExpressionResult.java
@@ -171,7 +171,7 @@ public abstract class ExpressionResult implements FunctionArgument {
*/
@Override
public boolean isOk() {
- return (this.getStatus() == null || this.getStatus().isOk());
+ return this.getStatus() == null || this.getStatus().isOk();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionArgument.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionArgument.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionArgument.java
index 11230b5..2c4ec12 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionArgument.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionArgument.java
@@ -44,7 +44,7 @@ public interface FunctionArgument {
*
* @return the <code>Status</code> from the evaluation of this <code>FunctionArgument</code>>
*/
- public Status getStatus();
+ Status getStatus();
/**
* Determines if this <code>FunctionArgument</code> is OK and can have its <code>AttributeValue</code> or
@@ -52,14 +52,14 @@ public interface FunctionArgument {
*
* @return true if this <code>FunctionArgument</code> is OK, otherwise false.
*/
- public boolean isOk();
+ boolean isOk();
/**
* Determines if this <code>FunctionArgument</code> represents a bag of values.
*
* @return true if this <code>FunctionArgument</code> represents a bag of values, else false.
*/
- public boolean isBag();
+ boolean isBag();
/**
* Gets the single <code>AttributeValue</code> representing the value of this
@@ -69,7 +69,7 @@ public interface FunctionArgument {
* @return the single <code>AttributeValue</code> representing the value of this
* <code>FunctionArgument</code>.
*/
- public AttributeValue<?> getValue();
+ AttributeValue<?> getValue();
/**
* Gets the {@link Bag} value for this <code>FunctionArgument</code> if the argument represents a
@@ -77,6 +77,6 @@ public interface FunctionArgument {
*
* @return the <code>Bag</code> value for this <code>FunctionArgument</code>.
*/
- public Bag getBag();
+ Bag getBag();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionDefinition.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionDefinition.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionDefinition.java
index 0414ba4..ababe14 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionDefinition.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/FunctionDefinition.java
@@ -45,7 +45,7 @@ public interface FunctionDefinition {
*
* @return the <code>Identifier</code> for this <code>FunctionDefinition</code>.
*/
- public Identifier getId();
+ Identifier getId();
/**
* Returns the <code>Identifier</code> for the data type returned by this function if
@@ -55,14 +55,14 @@ public interface FunctionDefinition {
* @return the <code>Identifier</code> for the XACML data type this <code>FunctionDefinition</code>
* returns
*/
- public Identifier getDataTypeId();
+ Identifier getDataTypeId();
/**
* Determines if this <code>FunctionDefinition</code> returns a bag of values or a single value.
*
* @return true if this <code>FunctionDefinition</code> returns a bag, else false
*/
- public boolean returnsBag();
+ boolean returnsBag();
/**
* Evaluates this <code>FunctionDefinition</code> on the given <code>List</code> of
@@ -73,5 +73,5 @@ public interface FunctionDefinition {
* @param arguments the <code>List</code> of <code>FunctionArgument</code>s for the evaluation
* @return an {@link ExpressionResult} with the results of the call
*/
- public ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments);
+ ExpressionResult evaluate(EvaluationContext evaluationContext, List<FunctionArgument> arguments);
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Match.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Match.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Match.java
index 301dced..a5d2234 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Match.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Match.java
@@ -134,7 +134,7 @@ public class Match extends PolicyComponent implements Matchable {
listArguments.add(arg2);
ExpressionResult expressionResult = functionDefinition.evaluate(evaluationContext, listArguments);
- assert (expressionResult != null);
+ assert expressionResult != null;
if (!expressionResult.isOk()) {
return new MatchResult(expressionResult.getStatus());
}
@@ -165,18 +165,18 @@ public class Match extends PolicyComponent implements Matchable {
}
FunctionDefinition functionDefinitionMatch = this.getFunctionDefinition();
- assert (functionDefinitionMatch != null);
+ assert functionDefinitionMatch != null;
AttributeValue<?> attributeValue = this.getAttributeValue();
- assert (attributeValue != null);
+ assert attributeValue != null;
FunctionArgument functionArgument1 = new FunctionArgumentAttributeValue(attributeValue);
AttributeRetrievalBase attributeRetrievalBase = this.getAttributeRetrievalBase();
- assert (attributeRetrievalBase != null);
+ assert attributeRetrievalBase != null;
ExpressionResult expressionResult = attributeRetrievalBase.evaluate(evaluationContext,
this.getPolicyDefaults());
- assert (expressionResult != null);
+ assert expressionResult != null;
if (!expressionResult.isOk()) {
return new MatchResult(expressionResult.getStatus());
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Policy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Policy.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Policy.java
index 715ca9e..8e50a11 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Policy.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Policy.java
@@ -283,7 +283,7 @@ public class Policy extends PolicyDef {
* See if we match
*/
MatchResult thisMatchResult = this.match(evaluationContext);
- assert (thisMatchResult != null);
+ assert thisMatchResult != null;
if (evaluationContext.isTracing()) {
evaluationContext.trace(new StdTraceEvent<MatchResult>("Match", this, thisMatchResult));
}
@@ -300,15 +300,15 @@ public class Policy extends PolicyDef {
* Get the combining elements
*/
List<CombiningElement<Rule>> ruleCombiningElements = this.getCombiningRules();
- assert (ruleCombiningElements != null);
+ assert ruleCombiningElements != null;
/*
* Run the combining algorithm
*/
- assert (this.getRuleCombiningAlgorithm() != null);
+ assert this.getRuleCombiningAlgorithm() != null;
EvaluationResult evaluationResultCombined = this.getRuleCombiningAlgorithm()
.combine(evaluationContext, ruleCombiningElements, this.getCombinerParameterList());
- assert (evaluationResultCombined != null);
+ assert evaluationResultCombined != null;
if (evaluationResultCombined.getDecision() == Decision.DENY
|| evaluationResultCombined.getDecision() == Decision.PERMIT) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyDefaults.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyDefaults.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyDefaults.java
index 868239f..d5e27e2 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyDefaults.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyDefaults.java
@@ -44,7 +44,7 @@ public class PolicyDefaults {
static {
try {
xpathVersionDefault = new URI(XACML.XPATHVERSION_2_0);
- } catch (Exception ex) {
+ } catch (Exception ex) { //NOPMD
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinder.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinder.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinder.java
index c254dcd..5f7658a 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinder.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinder.java
@@ -47,7 +47,7 @@ public interface PolicyFinder {
*
* @return a <code>PolicyFinderResult</code> with the root <code>PolicyDef</code>
*/
- public PolicyFinderResult<PolicyDef> getRootPolicyDef(EvaluationContext evaluationContext);
+ PolicyFinderResult<PolicyDef> getRootPolicyDef(EvaluationContext evaluationContext);
/**
* Gets the {@link Policy} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
@@ -56,7 +56,7 @@ public interface PolicyFinder {
* @return a <code>PolicyFinderResult</code> with the <code>Policy</code> matching the given
* <code>IdReferenceMatch</code>
*/
- public PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
+ PolicyFinderResult<Policy> getPolicy(IdReferenceMatch idReferenceMatch);
/**
* Gets the {@link PolicySet} that matches the given {@link com.att.research.xacml.api.IdReferenceMatch}.
@@ -65,6 +65,6 @@ public interface PolicyFinder {
* @return a <code>PolicyFinderResult</code> with the <code>PolicySet</code> matching the given
* <code>IdReferenceMatch</code>.
*/
- public PolicyFinderResult<PolicySet> getPolicySet(IdReferenceMatch idReferenceMatch);
+ PolicyFinderResult<PolicySet> getPolicySet(IdReferenceMatch idReferenceMatch);
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinderResult.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinderResult.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinderResult.java
index fe9a6e7..b71dc54 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinderResult.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicyFinderResult.java
@@ -45,12 +45,12 @@ public interface PolicyFinderResult<T extends PolicyDef> {
*
* @return the <code>Status</code> of the method call
*/
- public Status getStatus();
+ Status getStatus();
/**
* Gets the {@link PolicyDef} returned by the method if the status is OK.
*
* @return the <code>T</code> returned by the method if the status is OK.
*/
- public T getPolicyDef();
+ T getPolicyDef();
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicySet.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicySet.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicySet.java
index 75aded3..4ae250d 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicySet.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/PolicySet.java
@@ -205,7 +205,7 @@ public class PolicySet extends PolicyDef {
* See if we match
*/
MatchResult thisMatchResult = this.match(evaluationContext);
- assert (thisMatchResult != null);
+ assert thisMatchResult != null;
if (evaluationContext.isTracing()) {
evaluationContext.trace(new StdTraceEvent<MatchResult>("Match", this, thisMatchResult));
}
@@ -222,15 +222,15 @@ public class PolicySet extends PolicyDef {
* Get the combining elements
*/
List<CombiningElement<PolicySetChild>> listCombiningElements = this.getCombiningPolicies();
- assert (listCombiningElements != null);
+ assert listCombiningElements != null;
/*
* Run the PolicyCombiningAlgorithm
*/
- assert (this.getPolicyCombiningAlgorithm() != null);
+ assert this.getPolicyCombiningAlgorithm() != null;
EvaluationResult evaluationResultCombined = this.getPolicyCombiningAlgorithm()
.combine(evaluationContext, listCombiningElements, getCombinerParameterList());
- assert (evaluationResultCombined != null);
+ assert evaluationResultCombined != null;
if (evaluationResultCombined.getDecision() == Decision.DENY
|| evaluationResultCombined.getDecision() == Decision.PERMIT) {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Rule.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Rule.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Rule.java
index 1062bd0..f9bc8d7 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Rule.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/Rule.java
@@ -209,7 +209,7 @@ public class Rule extends PolicyComponent implements Matchable, Evaluatable, Tra
if (thisCondition != null) {
ExpressionResultBoolean expressionResultCondition = thisCondition
.evaluate(evaluationContext, this.getPolicy().getPolicyDefaults());
- assert (expressionResultCondition != null);
+ assert expressionResultCondition != null;
if (evaluationContext.isTracing()) {
evaluationContext
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/TargetedCombinerParameterMap.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/TargetedCombinerParameterMap.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/TargetedCombinerParameterMap.java
index 0e202e0..4b65fd0 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/TargetedCombinerParameterMap.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/TargetedCombinerParameterMap.java
@@ -84,23 +84,22 @@ public class TargetedCombinerParameterMap<T, U> {
* resolved
*/
protected void ensureMap() throws IllegalStateException {
- if (this.mapTargetToCombinerParameters == null) {
- if (this.targetedCombinerParameters != null && this.targetedCombinerParameters.size() > 0) {
- this.mapTargetToCombinerParameters = new HashMap<U, List<CombinerParameter>>();
- for (TargetedCombinerParameter<T, U> targetedCombinerParameter : this.targetedCombinerParameters) {
- U target = this.resolve(targetedCombinerParameter);
- if (target == null) {
- throw new IllegalStateException("Unresolved TargetCombinerParameter \""
- + targetedCombinerParameter.toString() + "\"");
- }
- List<CombinerParameter> listCombinerParameters = this.mapTargetToCombinerParameters
- .get(target);
- if (listCombinerParameters == null) {
- listCombinerParameters = new ArrayList<CombinerParameter>();
- this.mapTargetToCombinerParameters.put(target, listCombinerParameters);
- }
- listCombinerParameters.add(targetedCombinerParameter);
+ if (this.mapTargetToCombinerParameters == null
+ && this.targetedCombinerParameters != null && this.targetedCombinerParameters.size() > 0) {
+ this.mapTargetToCombinerParameters = new HashMap<U, List<CombinerParameter>>();
+ for (TargetedCombinerParameter<T, U> targetedCombinerParameter : this.targetedCombinerParameters) {
+ U target = this.resolve(targetedCombinerParameter);
+ if (target == null) {
+ throw new IllegalStateException("Unresolved TargetCombinerParameter \""
+ + targetedCombinerParameter.toString() + "\"");
}
+ List<CombinerParameter> listCombinerParameters = this.mapTargetToCombinerParameters
+ .get(target);
+ if (listCombinerParameters == null) {
+ listCombinerParameters = new ArrayList<CombinerParameter>();
+ this.mapTargetToCombinerParameters.put(target, listCombinerParameters);
+ }
+ listCombinerParameters.add(targetedCombinerParameter);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAnyOf.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAnyOf.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAnyOf.java
index 394e139..638240f 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAnyOf.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAnyOf.java
@@ -75,7 +75,7 @@ public class DOMAnyOf extends AnyOf {
Node child = children.item(i);
if (DOMUtil.isElement(child)) {
if (DOMUtil.isInNamespace(child, XACML3.XMLNS)
- && (XACML3.ELEMENT_ALLOF.equals(child.getLocalName()))) {
+ && XACML3.ELEMENT_ALLOF.equals(child.getLocalName())) {
domAnyOf.addAllOf(DOMAllOf.newInstance(child));
} else if (!bLenient) {
throw DOMUtil.newUnexpectedElementException(child, nodeAnyOf);
@@ -104,7 +104,7 @@ public class DOMAnyOf extends AnyOf {
Node child = children.item(i);
if (DOMUtil.isElement(child)) {
if (DOMUtil.isInNamespace(child, XACML3.XMLNS)
- && (XACML3.ELEMENT_ALLOF.equals(child.getLocalName()))) {
+ && XACML3.ELEMENT_ALLOF.equals(child.getLocalName())) {
result = DOMAllOf.repair(child) || result;
} else {
logger.warn("Unexpected element " + child.getNodeName());
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java
index c57069d..e1d6abb 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMApply.java
@@ -112,7 +112,8 @@ public class DOMApply extends Apply {
Node child = children.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE && XACML3.XMLNS.equals(child.getNamespaceURI())) {
String childName = child.getLocalName();
- if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) {
+ if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) { //NOPMD
+ // TODO
} else if (DOMExpression.isExpression(child)) {
result = DOMExpression.repair(child) || result;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAttributeAssignmentExpression.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAttributeAssignmentExpression.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAttributeAssignmentExpression.java
index dad26bb..f00ac17 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAttributeAssignmentExpression.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMAttributeAssignmentExpression.java
@@ -86,7 +86,6 @@ public class DOMAttributeAssignmentExpression extends AttributeAssignmentExpress
domAttributeAssignmentExpression.setAttributeId(DOMUtil
.getIdentifierAttribute(elementAttributeAssignmentExpression, XACML3.ATTRIBUTE_ATTRIBUTEID,
!bLenient));
- ;
if ((identifier = DOMUtil.getIdentifierAttribute(elementAttributeAssignmentExpression,
XACML3.ATTRIBUTE_CATEGORY)) != null) {
domAttributeAssignmentExpression.setCategory(identifier);
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java
index d44bbc5..360b798 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMExpression.java
@@ -60,10 +60,10 @@ public abstract class DOMExpression extends Expression {
public static boolean isExpression(Node nodeExpression) {
String nodeName = nodeExpression.getLocalName();
- return (XACML3.ELEMENT_APPLY.equals(nodeName) || XACML3.ELEMENT_ATTRIBUTEDESIGNATOR.equals(nodeName)
+ return XACML3.ELEMENT_APPLY.equals(nodeName) || XACML3.ELEMENT_ATTRIBUTEDESIGNATOR.equals(nodeName)
|| XACML3.ELEMENT_ATTRIBUTESELECTOR.equals(nodeName)
|| XACML3.ELEMENT_ATTRIBUTEVALUE.equals(nodeName) || XACML3.ELEMENT_FUNCTION.equals(nodeName) || XACML3.ELEMENT_VARIABLEREFERENCE
- .equals(nodeName));
+ .equals(nodeName);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicy.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicy.java
index a09ea54..e812450 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicy.java
@@ -116,52 +116,51 @@ public class DOMPolicy {
for (int i = 0; i < numChildren; i++) {
Node child = children.item(i);
- if (DOMUtil.isElement(child)) {
- if (DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
- String childName = child.getLocalName();
- if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) {
- if (domPolicy.getDescription() != null && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
- }
- domPolicy.setDescription(child.getTextContent());
- } else if (XACML3.ELEMENT_POLICYISSUER.equals(childName)) {
- if (domPolicy.getPolicyIssuer() != null && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
- }
- domPolicy.setPolicyIssuer(DOMPolicyIssuer.newInstance(child));
- } else if (XACML3.ELEMENT_POLICYDEFAULTS.equals(childName)) {
- } else if (XACML3.ELEMENT_TARGET.equals(childName)) {
- if (domPolicy.getTarget() != null && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
- }
- domPolicy.setTarget(DOMTarget.newInstance(child));
- } else if (XACML3.ELEMENT_COMBINERPARAMETERS.equals(childName)) {
- domPolicy.addCombinerParameters(DOMCombinerParameter.newList(child));
- } else if (XACML3.ELEMENT_RULECOMBINERPARAMETERS.equals(childName)) {
- domPolicy.addRuleCombinerParameter(DOMRuleCombinerParameters
- .newInstance(child));
- } else if (XACML3.ELEMENT_VARIABLEDEFINITION.equals(childName)) {
- domPolicy.addVariableDefinition(DOMVariableDefinition.newInstance(child,
- domPolicy));
- } else if (XACML3.ELEMENT_RULE.equals(childName)) {
- domPolicy.addRule(DOMRule.newInstance(child, domPolicy));
- } else if (XACML3.ELEMENT_OBLIGATIONEXPRESSIONS.equals(childName)) {
- if ((iterator = domPolicy.getObligationExpressions()) != null
- && iterator.hasNext() && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
- }
- domPolicy
- .setObligationExpressions(DOMObligationExpression.newList(child,
+ if (DOMUtil.isElement(child) && DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
+ String childName = child.getLocalName();
+ if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) {
+ if (domPolicy.getDescription() != null && !bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
+ }
+ domPolicy.setDescription(child.getTextContent());
+ } else if (XACML3.ELEMENT_POLICYISSUER.equals(childName)) {
+ if (domPolicy.getPolicyIssuer() != null && !bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
+ }
+ domPolicy.setPolicyIssuer(DOMPolicyIssuer.newInstance(child));
+ } else if (XACML3.ELEMENT_POLICYDEFAULTS.equals(childName)) { //NOPMD
+ // TODO
+ } else if (XACML3.ELEMENT_TARGET.equals(childName)) {
+ if (domPolicy.getTarget() != null && !bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
+ }
+ domPolicy.setTarget(DOMTarget.newInstance(child));
+ } else if (XACML3.ELEMENT_COMBINERPARAMETERS.equals(childName)) {
+ domPolicy.addCombinerParameters(DOMCombinerParameter.newList(child));
+ } else if (XACML3.ELEMENT_RULECOMBINERPARAMETERS.equals(childName)) {
+ domPolicy.addRuleCombinerParameter(DOMRuleCombinerParameters
+ .newInstance(child));
+ } else if (XACML3.ELEMENT_VARIABLEDEFINITION.equals(childName)) {
+ domPolicy.addVariableDefinition(DOMVariableDefinition.newInstance(child,
domPolicy));
- } else if (XACML3.ELEMENT_ADVICEEXPRESSIONS.equals(childName)) {
- if ((iterator = domPolicy.getAdviceExpressions()) != null
- && iterator.hasNext() && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
- }
- domPolicy.setAdviceExpressions(DOMAdviceExpression.newList(child, domPolicy));
- } else if (!bLenient) {
+ } else if (XACML3.ELEMENT_RULE.equals(childName)) {
+ domPolicy.addRule(DOMRule.newInstance(child, domPolicy));
+ } else if (XACML3.ELEMENT_OBLIGATIONEXPRESSIONS.equals(childName)) {
+ if ((iterator = domPolicy.getObligationExpressions()) != null
+ && iterator.hasNext() && !bLenient) {
throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
}
+ domPolicy
+ .setObligationExpressions(DOMObligationExpression.newList(child,
+ domPolicy));
+ } else if (XACML3.ELEMENT_ADVICEEXPRESSIONS.equals(childName)) {
+ if ((iterator = domPolicy.getAdviceExpressions()) != null
+ && iterator.hasNext() && !bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
+ }
+ domPolicy.setAdviceExpressions(DOMAdviceExpression.newList(child, domPolicy));
+ } else if (!bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicy);
}
}
}
@@ -219,75 +218,73 @@ public class DOMPolicy {
if (children != null && (numChildren = children.getLength()) > 0) {
for (int i = 0; i < numChildren; i++) {
Node child = children.item(i);
- if (DOMUtil.isElement(child)) {
- if (DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
- String childName = child.getLocalName();
- if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) {
- if (sawDescription) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawDescription = true;
- }
- } else if (XACML3.ELEMENT_POLICYISSUER.equals(childName)) {
- if (sawIssuer) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawDescription = true;
- result = DOMPolicyIssuer.repair(child) || result;
- }
- } else if (XACML3.ELEMENT_POLICYDEFAULTS.equals(childName)) {
- if (sawPolicyDefaults) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawPolicyDefaults = true;
- result = DOMPolicyDefaults.repair(child) || result;
- }
- } else if (XACML3.ELEMENT_TARGET.equals(childName)) {
- if (sawTarget) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawTarget = true;
- result = DOMTarget.repair(child) || result;
- }
- } else if (XACML3.ELEMENT_COMBINERPARAMETERS.equals(childName)) {
- result = DOMCombinerParameter.repair(child) || result;
- } else if (XACML3.ELEMENT_RULECOMBINERPARAMETERS.equals(childName)) {
- result = DOMRuleCombinerParameters.repair(child) || result;
- } else if (XACML3.ELEMENT_VARIABLEDEFINITION.equals(childName)) {
- result = DOMVariableDefinition.repair(child) || result;
- } else if (XACML3.ELEMENT_RULE.equals(childName)) {
- result = DOMRule.repair(child) || result;
- } else if (XACML3.ELEMENT_OBLIGATIONEXPRESSIONS.equals(childName)) {
- if (sawObligationExprs) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawObligationExprs = true;
- result = DOMObligationExpression.repairList(child) || result;
- }
- } else if (XACML3.ELEMENT_ADVICEEXPRESSIONS.equals(childName)) {
- if (sawAdviceExprs) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicy.removeChild(child);
- result = true;
- } else {
- sawAdviceExprs = true;
- result = DOMAdviceExpression.repairList(child) || result;
- }
+ if (DOMUtil.isElement(child) && DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
+ String childName = child.getLocalName();
+ if (XACML3.ELEMENT_DESCRIPTION.equals(childName)) {
+ if (sawDescription) {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
+ } else {
+ sawDescription = true;
+ }
+ } else if (XACML3.ELEMENT_POLICYISSUER.equals(childName)) {
+ if (sawIssuer) {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
+ } else {
+ sawDescription = true;
+ result = DOMPolicyIssuer.repair(child) || result;
+ }
+ } else if (XACML3.ELEMENT_POLICYDEFAULTS.equals(childName)) {
+ if (sawPolicyDefaults) {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
} else {
+ sawPolicyDefaults = true;
+ result = DOMPolicyDefaults.repair(child) || result;
+ }
+ } else if (XACML3.ELEMENT_TARGET.equals(childName)) {
+ if (sawTarget) {
logger.warn("Unexpected element " + child.getNodeName());
elementPolicy.removeChild(child);
result = true;
+ } else {
+ sawTarget = true;
+ result = DOMTarget.repair(child) || result;
+ }
+ } else if (XACML3.ELEMENT_COMBINERPARAMETERS.equals(childName)) {
+ result = DOMCombinerParameter.repair(child) || result;
+ } else if (XACML3.ELEMENT_RULECOMBINERPARAMETERS.equals(childName)) {
+ result = DOMRuleCombinerParameters.repair(child) || result;
+ } else if (XACML3.ELEMENT_VARIABLEDEFINITION.equals(childName)) {
+ result = DOMVariableDefinition.repair(child) || result;
+ } else if (XACML3.ELEMENT_RULE.equals(childName)) {
+ result = DOMRule.repair(child) || result;
+ } else if (XACML3.ELEMENT_OBLIGATIONEXPRESSIONS.equals(childName)) {
+ if (sawObligationExprs) {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
+ } else {
+ sawObligationExprs = true;
+ result = DOMObligationExpression.repairList(child) || result;
+ }
+ } else if (XACML3.ELEMENT_ADVICEEXPRESSIONS.equals(childName)) {
+ if (sawAdviceExprs) {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
+ } else {
+ sawAdviceExprs = true;
+ result = DOMAdviceExpression.repairList(child) || result;
}
+ } else {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicy.removeChild(child);
+ result = true;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyIssuer.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyIssuer.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyIssuer.java
index 77e8f58..9681a61 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyIssuer.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyIssuer.java
@@ -79,20 +79,18 @@ public class DOMPolicyIssuer extends PolicyIssuer {
if (children != null && (numChildren = children.getLength()) > 0) {
for (int i = 0; i < numChildren; i++) {
Node child = children.item(i);
- if (DOMUtil.isElement(child)) {
- if (DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
- String childName = child.getLocalName();
- if (XACML3.ELEMENT_CONTENT.equals(childName)) {
- if (domPolicyIssuer.getContent() != null && !bLenient) {
- throw DOMUtil.newUnexpectedElementException(child, nodePolicyIssuer);
- }
- domPolicyIssuer.setContent(child);
- } else if (XACML3.ELEMENT_ATTRIBUTE.equals(childName)) {
- domPolicyIssuer.add(DOMAttribute.newInstance(identifierCategoryPolicyIssuer,
- child));
- } else if (!bLenient) {
+ if (DOMUtil.isElement(child) && DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
+ String childName = child.getLocalName();
+ if (XACML3.ELEMENT_CONTENT.equals(childName)) {
+ if (domPolicyIssuer.getContent() != null && !bLenient) {
throw DOMUtil.newUnexpectedElementException(child, nodePolicyIssuer);
}
+ domPolicyIssuer.setContent(child);
+ } else if (XACML3.ELEMENT_ATTRIBUTE.equals(childName)) {
+ domPolicyIssuer.add(DOMAttribute.newInstance(identifierCategoryPolicyIssuer,
+ child));
+ } else if (!bLenient) {
+ throw DOMUtil.newUnexpectedElementException(child, nodePolicyIssuer);
}
}
}
@@ -117,24 +115,22 @@ public class DOMPolicyIssuer extends PolicyIssuer {
if (children != null && (numChildren = children.getLength()) > 0) {
for (int i = 0; i < numChildren; i++) {
Node child = children.item(i);
- if (DOMUtil.isElement(child)) {
- if (DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
- String childName = child.getLocalName();
- if (XACML3.ELEMENT_CONTENT.equals(childName)) {
- if (sawContent) {
- logger.warn("Unexpected element " + child.getNodeName());
- elementPolicyIssuer.removeChild(child);
- result = true;
- } else {
- sawContent = true;
- }
- } else if (XACML3.ELEMENT_ATTRIBUTE.equals(childName)) {
- result = DOMAttribute.repair(child) || result;
- } else {
+ if (DOMUtil.isElement(child) && DOMUtil.isInNamespace(child, XACML3.XMLNS)) {
+ String childName = child.getLocalName();
+ if (XACML3.ELEMENT_CONTENT.equals(childName)) {
+ if (sawContent) {
logger.warn("Unexpected element " + child.getNodeName());
elementPolicyIssuer.removeChild(child);
result = true;
+ } else {
+ sawContent = true;
}
+ } else if (XACML3.ELEMENT_ATTRIBUTE.equals(childName)) {
+ result = DOMAttribute.repair(child) || result;
+ } else {
+ logger.warn("Unexpected element " + child.getNodeName());
+ elementPolicyIssuer.removeChild(child);
+ result = true;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyRepair.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyRepair.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyRepair.java
index 6f5e87c..a7d8608 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyRepair.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicyRepair.java
@@ -78,7 +78,6 @@ public class DOMPolicyRepair {
System.err.println("IOException opening \"" + args[i + 1] + "\" for writing.");
ex.printStackTrace(System.err);
System.exit(1);
- ;
}
i += 2;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicySet.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicySet.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicySet.java
index f1d32b4..562de21 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicySet.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/dom/DOMPolicySet.java
@@ -128,7 +128,8 @@ public class DOMPolicySet {
throw DOMUtil.newUnexpectedElementException(child, nodePolicySet);
}
domPolicySet.setPolicyIssuer(DOMPolicyIssuer.newInstance(child));
- } else if (XACML3.ELEMENT_POLICYSETDEFAULTS.equals(childName)) {
+ } else if (XACML3.ELEMENT_POLICYSETDEFAULTS.equals(childName)) { //NOPMD
+ // TODO
} else if (XACML3.ELEMENT_TARGET.equals(childName)) {
if (domPolicySet.getTarget() != null && !bLenient) {
throw DOMUtil.newUnexpectedElementException(child, nodePolicySet);
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java
index a59e289..d462b93 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeDesignator.java
@@ -173,7 +173,7 @@ public class AttributeDesignator extends AttributeRetrievalBase {
* Set up the PIPRequest representing this
*/
PIPRequest pipRequest = this.getPIPRequest();
- assert (pipRequest != null);
+ assert pipRequest != null;
/*
* Query the evaluation context for results
@@ -184,7 +184,7 @@ public class AttributeDesignator extends AttributeRetrievalBase {
} catch (PIPException ex) {
throw new EvaluationException("PIPException getting Attributes", ex);
}
- assert (pipResponse != null);
+ assert pipResponse != null;
/*
* See if the request was successful
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java
index a72c131..086b288 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/policy/expressions/AttributeSelector.java
@@ -180,7 +180,7 @@ public class AttributeSelector extends AttributeRetrievalBase {
* element of the requested category.
*/
Request request = evaluationContext.getRequest();
- assert (request != null);
+ assert request != null;
/*
* Get the RequestAttributes objects for our Category. If none are found, then we abort quickly with
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdCombiningAlgorithmFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdCombiningAlgorithmFactory.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdCombiningAlgorithmFactory.java
index 5a0bafa..9cbb191 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdCombiningAlgorithmFactory.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdCombiningAlgorithmFactory.java
@@ -78,8 +78,8 @@ public class StdCombiningAlgorithmFactory extends CombiningAlgorithmFactory {
registerPolicyCombiningAlgorithm((CombiningAlgorithm<PolicySetChild>)field
.get(null));
}
- } catch (IllegalAccessException ex) {
-
+ } catch (IllegalAccessException ex) { // NOPMD
+ // TODO
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdFunctionDefinitionFactory.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdFunctionDefinitionFactory.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdFunctionDefinitionFactory.java
index 9f956eb..70e6229 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdFunctionDefinitionFactory.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdFunctionDefinitionFactory.java
@@ -66,8 +66,8 @@ public class StdFunctionDefinitionFactory extends FunctionDefinitionFactory {
&& Modifier.isPublic(field.getModifiers())) {
try {
register((FunctionDefinition)(field.get(null)));
- } catch (IllegalAccessException ex) {
-
+ } catch (IllegalAccessException ex) { //NOPMD
+ // TODO
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdPolicyFinder.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdPolicyFinder.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdPolicyFinder.java
index f7ea678..75bba60 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdPolicyFinder.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/StdPolicyFinder.java
@@ -158,11 +158,9 @@ public class StdPolicyFinder implements PolicyFinder {
bestVersion = match.getVersion();
} else {
Version matchVersion = match.getVersion();
- if (matchVersion != null) {
- if (matchVersion.compareTo(bestVersion) > 0) {
- bestMatch = match;
- bestVersion = matchVersion;
- }
+ if (matchVersion != null && matchVersion.compareTo(bestVersion) > 0) {
+ bestMatch = match;
+ bestVersion = matchVersion;
}
}
}
@@ -201,8 +199,8 @@ public class StdPolicyFinder implements PolicyFinder {
if (inputStream != null) {
try {
inputStream.close();
- } catch (Exception ex) {
-
+ } catch (Exception ex) { //NOPMD
+ // TODO
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/CombinedPermitOverrides.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/CombinedPermitOverrides.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/CombinedPermitOverrides.java
index 02beb67..0cd0469 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/CombinedPermitOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/CombinedPermitOverrides.java
@@ -75,7 +75,7 @@ public class CombinedPermitOverrides<T extends com.att.research.xacmlatt.pdp.eva
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
atLeastOneDeny = true;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyOverrides.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyOverrides.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyOverrides.java
index f206084..46701f6 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyOverrides.java
@@ -70,7 +70,7 @@ public class DenyOverrides<T extends com.att.research.xacmlatt.pdp.eval.Evaluata
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
return evaluationResultElement;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyUnlessPermit.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyUnlessPermit.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyUnlessPermit.java
index 1afb685..d9996d1 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyUnlessPermit.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/DenyUnlessPermit.java
@@ -65,7 +65,7 @@ public class DenyUnlessPermit<T extends com.att.research.xacmlatt.pdp.eval.Evalu
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
combinedResult.merge(evaluationResultElement);
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/FirstApplicable.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/FirstApplicable.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/FirstApplicable.java
index ce2731f..e46b002 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/FirstApplicable.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/FirstApplicable.java
@@ -62,7 +62,7 @@ public class FirstApplicable<T extends com.att.research.xacmlatt.pdp.eval.Evalua
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
if (evaluationResultElement.getDecision() != Decision.NOTAPPLICABLE) {
return evaluationResultElement;
}
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesPolicy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesPolicy.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesPolicy.java
index e30ddc3..a54bada 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesPolicy.java
@@ -68,7 +68,7 @@ public class LegacyDenyOverridesPolicy extends CombiningAlgorithmBase<PolicySetC
CombiningElement<PolicySetChild> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
return evaluationResultElement;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesRule.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesRule.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesRule.java
index 3ac14bf..afaeb39 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesRule.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyDenyOverridesRule.java
@@ -70,7 +70,7 @@ public class LegacyDenyOverridesRule extends CombiningAlgorithmBase<Rule> {
CombiningElement<Rule> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
return evaluationResultElement;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesPolicy.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesPolicy.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesPolicy.java
index 97dff2a..b02da2d 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesPolicy.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesPolicy.java
@@ -68,7 +68,7 @@ public class LegacyPermitOverridesPolicy extends CombiningAlgorithmBase<PolicySe
CombiningElement<PolicySetChild> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
atLeastOneDeny = true;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesRule.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesRule.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesRule.java
index 615e2d2..f700da3 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesRule.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/LegacyPermitOverridesRule.java
@@ -70,7 +70,7 @@ public class LegacyPermitOverridesRule extends CombiningAlgorithmBase<Rule> {
CombiningElement<Rule> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
atLeastOneDeny = true;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitOverrides.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitOverrides.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitOverrides.java
index 59816ff..dda5e68 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitOverrides.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitOverrides.java
@@ -70,7 +70,7 @@ public class PermitOverrides<T extends com.att.research.xacmlatt.pdp.eval.Evalua
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
atLeastOneDeny = true;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitUnlessDeny.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitUnlessDeny.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitUnlessDeny.java
index 57f286e..88ce393 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitUnlessDeny.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/combiners/PermitUnlessDeny.java
@@ -65,7 +65,7 @@ public class PermitUnlessDeny<T extends com.att.research.xacmlatt.pdp.eval.Evalu
CombiningElement<T> combiningElement = iterElements.next();
EvaluationResult evaluationResultElement = combiningElement.evaluate(evaluationContext);
- assert (evaluationResultElement != null);
+ assert evaluationResultElement != null;
switch (evaluationResultElement.getDecision()) {
case DENY:
return evaluationResultElement;
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionArithmetic.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionArithmetic.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionArithmetic.java
index 026b5cd..a478b2e 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionArithmetic.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionArithmetic.java
@@ -164,7 +164,7 @@ public class FunctionDefinitionArithmetic<T extends Number> extends FunctionDefi
break;
case DIVIDE:
if (this.getDataType() == DataTypes.DT_INTEGER) {
- if (((BigInteger)convertedArguments.get(1)).equals(new BigInteger("0"))) {
+ if (((BigInteger)convertedArguments.get(1)).equals(BigInteger.ZERO)) {
return ExpressionResult
.newError(new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
this.getShortFunctionId() + " Divide by 0 error: "
@@ -194,7 +194,7 @@ public class FunctionDefinitionArithmetic<T extends Number> extends FunctionDefi
}
break;
case MOD:
- if (((BigInteger)convertedArguments.get(1)).equals(new BigInteger("0"))) {
+ if (((BigInteger)convertedArguments.get(1)).equals(BigInteger.ZERO)) {
return ExpressionResult
.newError(new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR,
this.getShortFunctionId() + " Divide by 0 error: "
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/fbf04a93/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
----------------------------------------------------------------------
diff --git a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
index c6f0011..3947810 100644
--- a/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
+++ b/openaz-xacml-pdp/src/main/java/com/att/research/xacmlatt/pdp/std/functions/FunctionDefinitionBagOneAndOnly.java
@@ -105,7 +105,7 @@ public class FunctionDefinitionBagOneAndOnly<I> extends FunctionDefinitionBase<I
// get the single value from the bag
AttributeValue<?> attributeValueOneAndOnly = bag.getAttributeValues().next();
- assert (attributeValueOneAndOnly != null);
+ assert attributeValueOneAndOnly != null;
// make sure it has the right type
//