Commit 1b9acf8b authored by cdanger's avatar cdanger
Browse files

Merge branch 'master' into develop

parents c60ccba6 8cd14bd8
# Change log # Change log
All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions. All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions.
## Unreleased ## 3.8.3
### Fixed ### Fixed
- Removing Javadoc @author tag added automatically by maven Javadoc plugin without us knowing - Removing Javadoc @author tag added automatically by maven Javadoc plugin without us knowing
- PDP schema: removed limits (100) for maxVarRefDepth and maxPolicyRefDepth attributes. Hard arbitrary limits should not be in the XML schema. - PDP schema: removed limits (100) for maxVarRefDepth and maxPolicyRefDepth attributes. Hard arbitrary limits should not be in the XML schema.
......
...@@ -66,8 +66,6 @@ public final class PepActionExpression<JAXB_PEP_ACTION> ...@@ -66,8 +66,6 @@ public final class PepActionExpression<JAXB_PEP_ACTION>
* Expression factory for parsing/instantiating AttributeAssignment expressions * Expression factory for parsing/instantiating AttributeAssignment expressions
* @throws java.lang.IllegalArgumentException * @throws java.lang.IllegalArgumentException
* one of the AttributeAssignmentExpressions' Expression is invalid * one of the AttributeAssignmentExpressions' Expression is invalid
* @param <JAXB_PEP_ACTION>
* a JAXB_PEP_ACTION object.
*/ */
public PepActionExpression(PepActionFactory<JAXB_PEP_ACTION> pepActionFactory, String pepActionId, EffectType appliesTo, List<AttributeAssignmentExpression> jaxbAssignmentExps, public PepActionExpression(PepActionFactory<JAXB_PEP_ACTION> pepActionFactory, String pepActionId, EffectType appliesTo, List<AttributeAssignmentExpression> jaxbAssignmentExps,
XPathCompiler xPathCompiler, ExpressionFactory expFactory) throws IllegalArgumentException XPathCompiler xPathCompiler, ExpressionFactory expFactory) throws IllegalArgumentException
......
...@@ -39,8 +39,6 @@ public interface PepActionFactory<JAXB_T> ...@@ -39,8 +39,6 @@ public interface PepActionFactory<JAXB_T>
* @param actionId * @param actionId
* action ID (ObligationId, AdviceId) * action ID (ObligationId, AdviceId)
* @return PEP action * @return PEP action
* @param <JAXB_T>
* a JAXB_T object.
*/ */
JAXB_T getInstance(List<AttributeAssignment> attributeAssignments, String actionId); JAXB_T getInstance(List<AttributeAssignment> attributeAssignments, String actionId);
......
...@@ -44,7 +44,6 @@ public final class PrimitiveValueExpression<V extends AttributeValue> extends Va ...@@ -44,7 +44,6 @@ public final class PrimitiveValueExpression<V extends AttributeValue> extends Va
* static value * static value
* @param isStatic * @param isStatic
* true iff the expression based on this value always evaluates to the same constant in any context (not the case for xpathExpressions for instance) * true iff the expression based on this value always evaluates to the same constant in any context (not the case for xpathExpressions for instance)
* @param <V> a V object.
*/ */
public PrimitiveValueExpression(Datatype<V> type, V v, boolean isStatic) public PrimitiveValueExpression(Datatype<V> type, V v, boolean isStatic)
{ {
......
...@@ -50,7 +50,6 @@ public class PolicyVersions<P> implements Iterable<Entry<PolicyVersion, P>> ...@@ -50,7 +50,6 @@ public class PolicyVersions<P> implements Iterable<Entry<PolicyVersion, P>>
* @param policy * @param policy
* policy * policy
* @return previous policy registered at the same version, if any * @return previous policy registered at the same version, if any
* @param <P> a P object.
*/ */
public P put(PolicyVersion version, P policy) public P put(PolicyVersion version, P policy)
{ {
......
...@@ -40,7 +40,6 @@ public abstract class DurationValue<DAV extends DurationValue<DAV>> extends Simp ...@@ -40,7 +40,6 @@ public abstract class DurationValue<DAV extends DurationValue<DAV>> extends Simp
* duration * duration
* @throws java.lang.IllegalArgumentException * @throws java.lang.IllegalArgumentException
* if {@code val} is not a valid string representation for this datatype * if {@code val} is not a valid string representation for this datatype
* @param <DAV> a DAV object.
*/ */
public DurationValue(String datatypeId, Duration duration) throws IllegalArgumentException public DurationValue(String datatypeId, Duration duration) throws IllegalArgumentException
{ {
......
...@@ -36,8 +36,6 @@ public abstract class NumericValue<N extends Number, NAV extends NumericValue<N, ...@@ -36,8 +36,6 @@ public abstract class NumericValue<N extends Number, NAV extends NumericValue<N,
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @param val * @param val
* a N object. * a N object.
* @param <N> a N object.
* @param <NAV> a NAV object.
*/ */
protected NumericValue(String datatypeId, N val) protected NumericValue(String datatypeId, N val)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment