- Upgraded authzforce-ce-core-pdp-api dependency: 16.0.0

	- Changed PolicyProvider API. See CHANGELOG on core-pdp-api repository.
- Fixed #38 (GitHub)
	- Removed CoreRootPolicyProvider
	- Replaced CoreRefBasedRootPolicyProvider with CoreStaticPolicyProvider

README.md

@@ -131,7 +131,7 @@ Then instantiate a PDP engine configuration with method [PdpEngineConfiguration#
 
    ```xml
    <?xml version="1.0" encoding="UTF-8"?>
-   <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/6.0" version="6.0.0">
+   <pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/7.0" version="7.0.0">
 	   <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/policy.xml" />
    </pdp>
    ```

pdp-cli/src/test/resources/conformance/xacml-3.0-core/mandatory/pdp.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<pdp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://authzforce.github.io/core/xmlns/pdp/6.0" version="6.0.0">
-   <rootPolicyProvider id="rootPolicyProvider" xsi:type="StaticRootPolicyProvider" policyLocation="${PARENT_DIR}/IIA001/Policy.xml" />
-   <ioProcChain>
-      <requestPreproc>urn:ow2:authzforce:feature:pdp:request-preproc:xacml-json:default-lax</requestPreproc>
-      <resultPostproc>urn:ow2:authzforce:feature:pdp:result-postproc:xacml-json:default</resultPostproc>
-   </ioProcChain>
+<pdp
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://authzforce.github.io/core/xmlns/pdp/7.0"
+	version="7.0.0">
+	<policyProvider
+		id="rootPolicyProvider"
+		xsi:type="StaticPolicyProvider">
+		<policyLocation>${PARENT_DIR}/IIA001/Policy.xml</policyLocation>
+	</policyProvider>
+	<rootPolicyRef>urn:oasis:names:tc:xacml:2.0:conformance-test:IIA1:policy</rootPolicyRef>
+	<ioProcChain>
+		<requestPreproc>urn:ow2:authzforce:feature:pdp:request-preproc:xacml-json:default-lax</requestPreproc>
+		<resultPostproc>urn:ow2:authzforce:feature:pdp:result-postproc:xacml-json:default</resultPostproc>
+	</ioProcChain>
 </pdp>
 

pdp-engine/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>

pdp-engine/src/main/java/org/ow2/authzforce/core/pdp/impl/ModularAttributeProvider.java

@@ -42,7 +42,7 @@ import com.google.common.collect.ListMultimap;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
 
 /**
- * AttributeProvider that tries to resolve attributes in current request context first, else delegates to {@link DesignatedAttributeProvider}s.
+ * AttributeProvider that tries to resolve attributes in current request context first, else delegates to {@link NamedAttributeProvider}s.
  *
  * @version $Id: $
  */
@@ -97,7 +97,8 @@ public class ModularAttributeProvider implements AttributeProvider
 		if (selectedAttributeSupport == null)
 		{
 			designatorModsByAttrId = attributeProviderModulesByAttributeId;
-		} else
+		}
+		else
 		{
 			final ListMultimap<AttributeFqn, NamedAttributeProvider> mutableModsByAttrIdMap = ArrayListMultimap.create(selectedAttributeSupport.size(), 1);
 			for (final AttributeDesignatorType requiredAttr : selectedAttributeSupport)
@@ -206,7 +207,8 @@ public class ModularAttributeProvider implements AttributeProvider
 			LOGGER.debug("Values of attribute {}, type={} returned by attribute Provider module #{} (cached in context): {}", attributeFqn, datatype, attrProviders, result);
 			issuedToNonIssuedAttributeCopyMode.process(attributeFqn, result, context);
 			return result;
-		} catch (final IndeterminateEvaluationException e)
+		}
+		catch (final IndeterminateEvaluationException e)
 		{
 			/*
 			 * This error does not necessarily matter, it depends on whether the attribute is required, i.e. MustBePresent=true for AttributeDesignator/Selector So we let
@@ -248,7 +250,8 @@ public class ModularAttributeProvider implements AttributeProvider
 			 */
 			context.putNamedAttributeValueIfAbsent(attributeFqn, result);
 			return result;
-		} catch (final UnsupportedOperationException e)
+		}
+		catch (final UnsupportedOperationException e)
 		{
 			/*
 			 * Should not happen, this is highly unexpected and should be considered a fatal error (it means the AttributeProvider does not respect its contract)

pdp-engine/src/main/java/org/ow2/authzforce/core/pdp/impl/PdpEngineConfiguration.java

@@ -54,8 +54,9 @@ import org.ow2.authzforce.core.pdp.api.expression.ExpressionFactory;
 import org.ow2.authzforce.core.pdp.api.func.FirstOrderFunction;
 import org.ow2.authzforce.core.pdp.api.func.Function;
 import org.ow2.authzforce.core.pdp.api.io.XacmlJaxbParsingUtils;
-import org.ow2.authzforce.core.pdp.api.policy.CloseableRefPolicyProvider;
-import org.ow2.authzforce.core.pdp.api.policy.RootPolicyProvider;
+import org.ow2.authzforce.core.pdp.api.policy.CloseablePolicyProvider;
+import org.ow2.authzforce.core.pdp.api.policy.PolicyVersionPatterns;
+import org.ow2.authzforce.core.pdp.api.policy.TopLevelPolicyElementType;
 import org.ow2.authzforce.core.pdp.api.value.AttributeValueFactory;
 import org.ow2.authzforce.core.pdp.api.value.AttributeValueFactoryRegistry;
 import org.ow2.authzforce.core.pdp.api.value.Datatype;
@@ -73,6 +74,7 @@ import org.ow2.authzforce.core.pdp.impl.func.StandardFunction;
 import org.ow2.authzforce.core.xmlns.pdp.InOutProcChain;
 import org.ow2.authzforce.core.xmlns.pdp.Pdp;
 import org.ow2.authzforce.core.xmlns.pdp.StandardEnvironmentAttributeSource;
+import org.ow2.authzforce.core.xmlns.pdp.TopLevelPolicyElementRef;
 import org.ow2.authzforce.xacml.identifiers.XacmlDatatypeId;
 import org.ow2.authzforce.xmlns.pdp.ext.AbstractAttributeProvider;
 import org.ow2.authzforce.xmlns.pdp.ext.AbstractDecisionCache;
@@ -95,7 +97,7 @@ public final class PdpEngineConfiguration
 	private static final IllegalArgumentException ILLEGAL_USE_STD_FUNCTIONS_ARGUMENT_EXCEPTION = new IllegalArgumentException(
 	        "useStandardFunctions = true not allowed if useStandardDatatypes = false");
 
-	private static final IllegalArgumentException NULL_ROOTPOLICYPROVIDER_ARGUMENT_EXCEPTION = new IllegalArgumentException("Undefined rootPolicyProvider");
+	private static final IllegalArgumentException NULL_POLICYPROVIDER_ARGUMENT_EXCEPTION = new IllegalArgumentException("Undefined policyProvider");
 
 	// the logger we'll use for all messages
 	private static final Logger LOGGER = LoggerFactory.getLogger(BasePdpEngine.class);
@@ -132,21 +134,13 @@ public final class PdpEngineConfiguration
 		return attrProviderModBuilder.getInstance(jaxbConf, envProps);
 	}
 
-	private static <JAXB_CONF extends AbstractPolicyProvider> CloseableRefPolicyProvider newRefPolicyProvider(final JAXB_CONF jaxbConf, final XmlnsFilteringParserFactory xacmlParserFactory,
+	private static <JAXB_CONF extends AbstractPolicyProvider> CloseablePolicyProvider<?> newPolicyProvider(final JAXB_CONF jaxbConf, final XmlnsFilteringParserFactory xacmlParserFactory,
 	        final int maxPolicySetRefDepth, final ExpressionFactory xacmlExprFactory, final CombiningAlgRegistry combiningAlgRegistry, final EnvironmentProperties envProps)
 	{
-		final CloseableRefPolicyProvider.Factory<JAXB_CONF> refPolicyProviderModFactory = PdpExtensions.getRefPolicyProviderFactory((Class<JAXB_CONF>) jaxbConf.getClass());
+		final CloseablePolicyProvider.Factory<JAXB_CONF> refPolicyProviderModFactory = PdpExtensions.getRefPolicyProviderFactory((Class<JAXB_CONF>) jaxbConf.getClass());
 		return refPolicyProviderModFactory.getInstance(jaxbConf, xacmlParserFactory, maxPolicySetRefDepth, xacmlExprFactory, combiningAlgRegistry, envProps);
 	}
 
-	private static <JAXB_CONF extends AbstractPolicyProvider> RootPolicyProvider newRootPolicyProvider(final JAXB_CONF jaxbConf, final XmlnsFilteringParserFactory xacmlParserFactory,
-	        final ExpressionFactory xacmlExprFactory, final CombiningAlgRegistry combiningAlgRegistry, final Optional<CloseableRefPolicyProvider> refPolicyProvider,
-	        final EnvironmentProperties envProps)
-	{
-		final RootPolicyProvider.Factory<JAXB_CONF> rootPolicyProviderFactory = PdpExtensions.getRootPolicyProviderFactory((Class<JAXB_CONF>) jaxbConf.getClass());
-		return rootPolicyProviderFactory.getInstance(jaxbConf, xacmlParserFactory, xacmlExprFactory, combiningAlgRegistry, refPolicyProvider, envProps);
-	}
-
 	private static <JAXB_CONF extends AbstractDecisionCache> DecisionCache newDecisionCache(final JAXB_CONF jaxbConf, final AttributeValueFactoryRegistry attValFactories,
 	        final EnvironmentProperties envProps)
 	{
@@ -159,7 +153,13 @@ public final class PdpEngineConfiguration
 
 	private final ExpressionFactory xacmlExpressionFactory;
 
-	private final RootPolicyProvider rootPolicyProvider;
+	private final CloseablePolicyProvider<?> policyProvider;
+
+	private final String rootPolicyId;
+
+	private final Optional<TopLevelPolicyElementType> rootPolicyElementType;
+
+	private final Optional<PolicyVersionPatterns> rootPolicyVersionPatterns;
 
 	private final boolean strictAttributeIssuerMatch;
 
@@ -189,12 +189,12 @@ public final class PdpEngineConfiguration
 		 * Check required args
 		 */
 		/*
-		 * Root policy provider
+		 * Policy provider
 		 */
-		final AbstractPolicyProvider rootPolicyProviderJaxbConf = pdpJaxbConf.getRootPolicyProvider();
+		final AbstractPolicyProvider rootPolicyProviderJaxbConf = pdpJaxbConf.getPolicyProvider();
 		if (rootPolicyProviderJaxbConf == null)
 		{
-			throw NULL_ROOTPOLICYPROVIDER_ARGUMENT_EXCEPTION;
+			throw NULL_POLICYPROVIDER_ARGUMENT_EXCEPTION;
 		}
 
 		/*
@@ -221,11 +221,13 @@ public final class PdpEngineConfiguration
 			if (datatypeExtensionIdentifiers.isEmpty())
 			{
 				attValFactoryRegistry = stdRegistry;
-			} else
+			}
+			else
 			{
 				attValFactoryRegistry = new ImmutableAttributeValueFactoryRegistry(HashCollections.newImmutableSet(stdRegistry.getExtensions(), datatypeExtensions));
 			}
-		} else
+		}
+		else
 		{
 			attValFactoryRegistry = new ImmutableAttributeValueFactoryRegistry(datatypeExtensions);
 		}
@@ -255,7 +257,8 @@ public final class PdpEngineConfiguration
 		try
 		{
 			maxVarRefDepth = bigMaxVarRefDepth == null ? -1 : bigMaxVarRefDepth.intValueExact();
-		} catch (final ArithmeticException e)
+		}
+		catch (final ArithmeticException e)
 		{
 			throw new IllegalArgumentException("Invalid maxVariableRefDepth: " + bigMaxVarRefDepth, e);
 		}
@@ -292,12 +295,14 @@ public final class PdpEngineConfiguration
 			if (nonGenericFunctionExtensionIdentifiers.isEmpty())
 			{
 				functionRegistry = stdRegistry;
-			} else
+			}
+			else
 			{
 				functionRegistry = new ImmutableFunctionRegistry(HashCollections.newImmutableSet(stdRegistry.getNonGenericFunctions(), nonGenericFunctionExtensions),
 				        stdRegistry.getGenericFunctionFactories());
 			}
-		} else
+		}
+		else
 		{
 			functionRegistry = new ImmutableFunctionRegistry(nonGenericFunctionExtensions, null);
 		}
@@ -331,11 +336,13 @@ public final class PdpEngineConfiguration
 			if (algExtensions.isEmpty())
 			{
 				combiningAlgRegistry = StandardCombiningAlgorithm.REGISTRY;
-			} else
+			}
+			else
 			{
 				combiningAlgRegistry = new ImmutableCombiningAlgRegistry(HashCollections.newImmutableSet(StandardCombiningAlgorithm.REGISTRY.getExtensions(), algExtensions));
 			}
-		} else
+		}
+		else
 		{
 			combiningAlgRegistry = new ImmutableCombiningAlgRegistry(algExtensions);
 		}
@@ -348,7 +355,8 @@ public final class PdpEngineConfiguration
 		try
 		{
 			maxPolicySetRefDepth = bigMaxPolicyRefDepth == null ? -1 : bigMaxPolicyRefDepth.intValueExact();
-		} catch (final ArithmeticException e)
+		}
+		catch (final ArithmeticException e)
 		{
 			throw new IllegalArgumentException("Invalid maxPolicyRefDepth: " + bigMaxPolicyRefDepth, e);
 		}
@@ -359,29 +367,29 @@ public final class PdpEngineConfiguration
 		xacmlExpressionFactory = new DepthLimitingExpressionFactory(attValFactoryRegistry, functionRegistry, attProviderFactories, maxVarRefDepth, enableXPath, strictAttributeIssuerMatch);
 
 		/*
-		 * Policy Reference processing - Policy-by-reference Provider
+		 * Policy Provider
 		 */
-		final AbstractPolicyProvider refPolicyProviderJaxbConf = pdpJaxbConf.getRefPolicyProvider();
-		final Optional<CloseableRefPolicyProvider> refPolicyProvider;
-		if (refPolicyProviderJaxbConf == null)
-		{
-			refPolicyProvider = Optional.empty();
-		} else
-		{
-			refPolicyProvider = Optional.of(newRefPolicyProvider(refPolicyProviderJaxbConf, xacmlParserFactory, maxPolicySetRefDepth, xacmlExpressionFactory, combiningAlgRegistry, envProps));
-		}
+		final AbstractPolicyProvider policyProviderJaxbConf = pdpJaxbConf.getPolicyProvider();
+		policyProvider = newPolicyProvider(policyProviderJaxbConf, xacmlParserFactory, maxPolicySetRefDepth, xacmlExpressionFactory, combiningAlgRegistry, envProps);
 
+		final TopLevelPolicyElementRef rootPolicyRef = pdpJaxbConf.getRootPolicyRef();
 		/*
-		 * Root Policy Provider
+		 * PDP XSD assumed to ensure rootPolicyRef is defined
 		 */
-		rootPolicyProvider = newRootPolicyProvider(rootPolicyProviderJaxbConf, xacmlParserFactory, xacmlExpressionFactory, combiningAlgRegistry, refPolicyProvider, envProps);
+		assert rootPolicyRef != null;
+		final Boolean mustBePolicySet = rootPolicyRef.isPolicySet();
+		this.rootPolicyElementType = mustBePolicySet == null ? Optional.empty()
+		        : mustBePolicySet.booleanValue() ? Optional.of(TopLevelPolicyElementType.POLICY_SET) : Optional.of(TopLevelPolicyElementType.POLICY);
+		this.rootPolicyId = rootPolicyRef.getValue();
+		this.rootPolicyVersionPatterns = Optional.ofNullable(new PolicyVersionPatterns(rootPolicyRef.getVersion(), null, null));
 
 		// Decision cache
 		final AbstractDecisionCache decisionCacheJaxbConf = pdpJaxbConf.getDecisionCache();
 		if (decisionCacheJaxbConf == null)
 		{
 			decisionCache = Optional.empty();
-		} else
+		}
+		else
 		{
 			decisionCache = Optional.of(newDecisionCache(decisionCacheJaxbConf, attValFactoryRegistry, envProps));
 		}
@@ -391,7 +399,8 @@ public final class PdpEngineConfiguration
 		try
 		{
 			this.clientReqErrVerbosityLevel = clientReqErrVerbosityBigInt == null ? 0 : clientReqErrVerbosityBigInt.intValueExact();
-		} catch (final ArithmeticException e)
+		}
+		catch (final ArithmeticException e)
 		{
 			throw new IllegalArgumentException("Invalid clientRequestErrorVerbosityLevel: " + clientReqErrVerbosityBigInt, e);
 		}
@@ -401,7 +410,8 @@ public final class PdpEngineConfiguration
 		if (inoutProcChains.isEmpty())
 		{
 			this.ioProcChainsByInputType = Collections.emptyMap();
-		} else
+		}
+		else
 		{
 			final Map<Class<?>, Entry<DecisionRequestPreprocessor<?, ?>, DecisionResultPostprocessor<?, ?>>> mutableInoutProcChainsByInputType = HashCollections
 			        .newUpdatableMap(inoutProcChains.size());
@@ -414,7 +424,8 @@ public final class PdpEngineConfiguration
 				if (resultPostprocId == null)
 				{
 					decisionResultPostproc = null;
-				} else
+				}
+				else
 				{
 					final DecisionResultPostprocessor.Factory<?, ?> resultPostprocFactory = PdpExtensions.getExtension(DecisionResultPostprocessor.Factory.class, resultPostprocId);
 					decisionResultPostproc = resultPostprocFactory.getInstance(clientReqErrVerbosityLevel);
@@ -464,7 +475,8 @@ public final class PdpEngineConfiguration
 		try
 		{
 			pdpJaxbConf = modelHandler.unmarshal(confXmlSrc, Pdp.class);
-		} catch (final JAXBException e)
+		}
+		catch (final JAXBException e)
 		{
 			throw new IllegalArgumentException("Invalid PDP configuration file", e);
 		}
@@ -546,7 +558,8 @@ public final class PdpEngineConfiguration
 		{
 			final File confFile = ResourceUtils.getFile(confLocation);
 			return getInstance(confFile, modelHandler);
-		} catch (final FileNotFoundException e)
+		}
+		catch (final FileNotFoundException e)
 		{
 			if (LOGGER.isInfoEnabled())
 			{
@@ -563,7 +576,8 @@ public final class PdpEngineConfiguration
 		try
 		{
 			confUrl = ResourceUtils.getURL(confLocation);
-		} catch (final FileNotFoundException e)
+		}
+		catch (final FileNotFoundException e)
 		{
 			throw new IllegalArgumentException("Invalid PDP configuration location (neither a file in the file system nor a valid URL): " + confLocation, e);
 		}
@@ -603,19 +617,19 @@ public final class PdpEngineConfiguration
 	 * 	<xs:import namespace="http://authzforce.github.io/core/xmlns/test/3" />
 	 * </xs:schema>
 	 * 			}
-	 *            </pre>
+	 * </pre>
 	 *
-	 *            In this example, the file at {@code catalogLocation} must define the schemaLocation for the imported namespace above using a line like this (for an XML-formatted catalog):
+	 * In this example, the file at {@code catalogLocation} must define the schemaLocation for the imported namespace above using a line like this (for an XML-formatted catalog):
 	 * 
-	 *            <pre>
+	 * <pre>
 	 *            {@literal
 	 *            <uri name="http://authzforce.github.io/core/xmlns/test/3" uri=
 	 * 	"classpath:org.ow2.authzforce.core.test.xsd" />
 	 *            }
-	 *            </pre>
+	 * </pre>
 	 * 
-	 *            We assume that this XML type is an extension of one the PDP extension base types, 'AbstractAttributeProvider' (that extends 'AbstractPdpExtension' like all other extension base
-	 *            types) in this case.
+	 * We assume that this XML type is an extension of one the PDP extension base types, 'AbstractAttributeProvider' (that extends 'AbstractPdpExtension' like all other extension base types) in this
+	 * case.
 	 * @param catalogLocation
 	 *            location of XML catalog for resolving XSDs imported by the extension XSD specified as 'extensionXsdLocation' argument (may be null if 'extensionXsdLocation' is null)
 	 * @return PDP instance
@@ -656,19 +670,19 @@ public final class PdpEngineConfiguration
 	 * 	<xs:import namespace="http://authzforce.github.io/core/xmlns/test/3" />
 	 * </xs:schema>
 	 * 			}
-	 *            </pre>
+	 * </pre>
 	 *
-	 *            In this example, the file at {@code catalogLocation} must define the schemaLocation for the imported namespace above using a line like this (for an XML-formatted catalog):
+	 * In this example, the file at {@code catalogLocation} must define the schemaLocation for the imported namespace above using a line like this (for an XML-formatted catalog):
 	 * 
-	 *            <pre>
+	 * <pre>
 	 *            {@literal
 	 *            <uri name="http://authzforce.github.io/core/xmlns/test/3" uri=
 	 * 	"classpath:org.ow2.authzforce.core.test.xsd" />
 	 *            }
-	 *            </pre>
+	 * </pre>
 	 * 
-	 *            We assume that this XML type is an extension of one the PDP extension base types, 'AbstractAttributeProvider' (that extends 'AbstractPdpExtension' like all other extension base
-	 *            types) in this case.
+	 * We assume that this XML type is an extension of one the PDP extension base types, 'AbstractAttributeProvider' (that extends 'AbstractPdpExtension' like all other extension base types) in this
+	 * case.
 	 * @param catalogLocation
 	 *            location of XML catalog for resolving XSDs imported by the extension XSD specified as 'extensionXsdLocation' argument (may be null if 'extensionXsdLocation' is null)
 	 * @return PDP instance
@@ -735,9 +749,39 @@ public final class PdpEngineConfiguration
 	 * 
 	 * @return the Root Policy Provider
 	 */
-	public RootPolicyProvider getRootPolicyProvider()
+	public CloseablePolicyProvider<?> getPolicyProvider()
+	{
+		return policyProvider;
+	}
+
+	/**
+	 * Returns the type of the root policy element where the evaluation starts
+	 * 
+	 * @return type of the root policy element (XACML Policy or XACML PolicySet)
+	 */
+	public Optional<TopLevelPolicyElementType> getRootPolicyElementType()
+	{
+		return rootPolicyElementType;
+	}
+
+	/**
+	 * Returns ID of policy where to start the evaluation
+	 * 
+	 * @return root policy ID
+	 */
+	public String getRootPolicyId()
+	{
+		return rootPolicyId;
+	}
+
+	/**
+	 * Returns the version matching rules for the root policy
+	 * 
+	 * @return the version or version matching rules for the root policy
+	 */
+	public Optional<PolicyVersionPatterns> getRootPolicyVersionPatterns()
 	{
-		return rootPolicyProvider;
+		return rootPolicyVersionPatterns;
 	}
 
 	/**

pdp-engine/src/main/java/org/ow2/authzforce/core/pdp/impl/PdpExtensions.java

@@ -32,8 +32,7 @@ import org.ow2.authzforce.core.pdp.api.JaxbBoundPdpExtension;
 import org.ow2.authzforce.core.pdp.api.PdpExtension;
 import org.ow2.authzforce.core.pdp.api.combining.CombiningAlg;
 import org.ow2.authzforce.core.pdp.api.func.Function;
-import org.ow2.authzforce.core.pdp.api.policy.CloseableRefPolicyProvider;
-import org.ow2.authzforce.core.pdp.api.policy.RootPolicyProvider;
+import org.ow2.authzforce.core.pdp.api.policy.CloseablePolicyProvider;
 import org.ow2.authzforce.core.pdp.api.value.AttributeValueFactory;
 import org.ow2.authzforce.xmlns.pdp.ext.AbstractAttributeProvider;
 import org.ow2.authzforce.xmlns.pdp.ext.AbstractDecisionCache;
@@ -97,7 +96,8 @@ public final class PdpExtensions
 				}
 
 				isValidExt = true;
-			} else
+			}
+			else
 			{
 				for (final Class<? extends PdpExtension> extClass : NON_JAXB_BOUND_EXTENSION_CLASSES)
 				{
@@ -229,7 +229,7 @@ public final class PdpExtensions
 	 * @throws java.lang.IllegalArgumentException
 	 *             if there is no extension of type {@link org.ow2.authzforce.core.pdp.api.policy.CloseableRefPolicyProvider.Factory} supporting {@code jaxbPdpExtensionClass}
 	 */
-	public static <REF_POLICY_PROVIDER_CONF extends AbstractPolicyProvider> CloseableRefPolicyProvider.Factory<REF_POLICY_PROVIDER_CONF> getRefPolicyProviderFactory(
+	public static <REF_POLICY_PROVIDER_CONF extends AbstractPolicyProvider> CloseablePolicyProvider.Factory<REF_POLICY_PROVIDER_CONF> getRefPolicyProviderFactory(
 	        final Class<REF_POLICY_PROVIDER_CONF> jaxbConfClass) throws IllegalArgumentException
 	{
 		final JaxbBoundPdpExtension<REF_POLICY_PROVIDER_CONF> ext = (JaxbBoundPdpExtension<REF_POLICY_PROVIDER_CONF>) JAXB_BOUND_EXTENSIONS_BY_JAXB_CLASS.get(jaxbConfClass);
@@ -238,43 +238,43 @@ public final class PdpExtensions
 			throw new IllegalArgumentException("No PDP extension found supporting JAXB (configuration) type: " + jaxbConfClass + ". Expected types: " + JAXB_BOUND_EXTENSIONS_BY_JAXB_CLASS.keySet());
 		}
 
-		if (!(ext instanceof CloseableRefPolicyProvider.Factory))
+		if (!(ext instanceof CloseablePolicyProvider.Factory))
 		{
 			throw new IllegalArgumentException(
-			        "No PDP extension of type " + CloseableRefPolicyProvider.Factory.class + " (Reference-based Policy Provider factory) supporting JAXB/XML (configuration) type: " + jaxbConfClass);
+			        "No PDP extension of type " + CloseablePolicyProvider.Factory.class + " (Reference-based Policy Provider factory) supporting JAXB/XML (configuration) type: " + jaxbConfClass);
 		}
 
-		return (CloseableRefPolicyProvider.Factory<REF_POLICY_PROVIDER_CONF>) ext;
+		return (CloseablePolicyProvider.Factory<REF_POLICY_PROVIDER_CONF>) ext;
 	}
 
 	/**
-	 * Create RootPolicyProvider
+	 * Create PolicyProvider
 	 * 
 	 * @param jaxbConfClass
 	 *            XML-schema-derived type of policy provider configuration
 	 * 
-	 * @return Root Policy Provider
+	 * @return Policy Provider
 	 * @throws java.lang.IllegalArgumentException
-	 *             if there is no extension of type {@link org.ow2.authzforce.core.pdp.api.policy.RootPolicyProvider.Factory} supporting {@code jaxbPdpExtensionClass} or invalid
+	 *             if there is no extension of type {@link org.ow2.authzforce.core.pdp.api.policy.CloseablePolicyProvider.Factory} supporting {@code jaxbPdpExtensionClass} or invalid
 	 *             {@code jaxbRootPolicyProviderConf}
 	 */
 
-	public static <ROOT_POLICY_PROVIDER_CONF extends AbstractPolicyProvider> RootPolicyProvider.Factory<ROOT_POLICY_PROVIDER_CONF> getRootPolicyProviderFactory(
-	        final Class<ROOT_POLICY_PROVIDER_CONF> jaxbConfClass) throws IllegalArgumentException
+	public static <POLICY_PROVIDER_CONF extends AbstractPolicyProvider> CloseablePolicyProvider.Factory<POLICY_PROVIDER_CONF> getRootPolicyProviderFactory(
+	        final Class<POLICY_PROVIDER_CONF> jaxbConfClass) throws IllegalArgumentException
 	{
-		final JaxbBoundPdpExtension<ROOT_POLICY_PROVIDER_CONF> ext = (JaxbBoundPdpExtension<ROOT_POLICY_PROVIDER_CONF>) JAXB_BOUND_EXTENSIONS_BY_JAXB_CLASS.get(jaxbConfClass);
+		final JaxbBoundPdpExtension<POLICY_PROVIDER_CONF> ext = (JaxbBoundPdpExtension<POLICY_PROVIDER_CONF>) JAXB_BOUND_EXTENSIONS_BY_JAXB_CLASS.get(jaxbConfClass);
 		if (ext == null)
 		{
 			throw new IllegalArgumentException("No PDP extension found supporting JAXB (configuration) type: " + jaxbConfClass + ". Expected types: " + JAXB_BOUND_EXTENSIONS_BY_JAXB_CLASS.keySet());
 		}
 
-		if (!(ext instanceof RootPolicyProvider.Factory))
+		if (!(ext instanceof CloseablePolicyProvider.Factory))
 		{
 			throw new IllegalArgumentException(
-			        "No PDP extension of type " + RootPolicyProvider.Factory.class + " (Root Policy Provider factory) supporting JAXB/XML (configuration) type: " + jaxbConfClass);
+			        "No PDP extension of type " + CloseablePolicyProvider.Factory.class + " (Policy Provider factory) supporting JAXB/XML (configuration) type: " + jaxbConfClass);
 		}
 
-		return (RootPolicyProvider.Factory<ROOT_POLICY_PROVIDER_CONF>) ext;
+		return (CloseablePolicyProvider.Factory<POLICY_PROVIDER_CONF>) ext;
 	}
 
 	/**

pdp-engine/src/main/java/org/ow2/authzforce/core/pdp/impl/PepActionExpression.java

@@ -56,12 +56,8 @@ public final class PepActionExpression
 	/**
 	 * Constructor that takes all the data associated with an PEP action (obligation/advice) expression.
 	 *
-	 * @param pepActionFactory
-	 *            PEP action factory
 	 * @param pepActionId
 	 *            the obligation's id
-	 * @param appliesTo
-	 *            the type of decision to which the PEP action applies (ObligationExpression's FulfillOn / AdviceExpression's AppliesTo)
 	 * @param isMandatory
 	 *            true iff the PEP action is mandatory (XACML Obligation, as opposed to Advice)
 	 * @param jaxbAssignmentExps
@@ -84,7 +80,8 @@ public final class PepActionExpression
 		if (jaxbAssignmentExps == null || jaxbAssignmentExps.isEmpty())
 		{
 			this.evaluatableAttributeAssignmentExpressions = Collections.emptyList();
-		} else
+		}
+		else
 		{
 			this.evaluatableAttributeAssignmentExpressions = new ArrayList<>(jaxbAssignmentExps.size());
 			for (final AttributeAssignmentExpression jaxbAttrAssignExp : jaxbAssignmentExps)
@@ -93,7 +90,8 @@ public final class PepActionExpression
 				try
 				{
 					attrAssignExp = new AttributeAssignmentExpressionEvaluator(jaxbAttrAssignExp, xPathCompiler, expFactory);
-				} catch (final IllegalArgumentException e)
+				}
+				catch (final IllegalArgumentException e)
 				{
 					throw new IllegalArgumentException("Invalid " + toString + ": Invalid AttributeAssignmentExpression[@AttributeId=" + jaxbAttrAssignExp.getAttributeId() + "]", e);
 				}
@@ -142,7 +140,8 @@ public final class PepActionExpression
 			{
 				attrAssignsFromExpr = attrAssignmentExpr.evaluate(context);
 				LOGGER.debug("{}/{} -> {}", this, attrAssignmentExpr, attrAssignsFromExpr);
-			} catch (final IndeterminateEvaluationException e)
+			}
+			catch (final IndeterminateEvaluationException e)
 			{
 				throw new IndeterminateEvaluationException(this + ": Error evaluating " + attrAssignmentExpr, e.getStatusCode(), e);
 			}