[java-identity-provider] branch master updated: JPAR-131 - Fix doclint issues
Ian Young
ian at iay.org.uk
Thu Dec 19 13:56:21 EST 2019
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3b28731f5d4fd154f22435844ce9f83850c47baf
The following commit(s) were added to refs/heads/master by this push:
new 3b28731 JPAR-131 - Fix doclint issues
3b28731 is described below
commit 3b28731f5d4fd154f22435844ce9f83850c47baf
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Dec 19 18:56:15 2019 +0000
JPAR-131 - Fix doclint issues
https://issues.shibboleth.net/jira/browse/JPAR-131
---
.../attribute/filter/matcher/impl/AbstractMatcher.java | 6 ++----
.../matcher/impl/AttributeScopeRegexpMatcher.java | 5 ++++-
.../matcher/impl/AttributeScopeStringMatcher.java | 5 ++++-
.../matcher/impl/AttributeValueRegexpMatcher.java | 5 ++++-
.../matcher/impl/AttributeValueStringMatcher.java | 5 ++++-
.../attribute/filter/matcher/impl/ScriptedMatcher.java | 6 ++++++
.../attribute/filter/matcher/logic/impl/NotMatcher.java | 6 ++++--
.../saml/impl/AbstractMatchesShibMDScopeMatcher.java | 2 +-
.../matcher/saml/impl/AttributeInMetadataMatcher.java | 2 +-
.../filter/policyrule/impl/AbstractPolicyRule.java | 3 +--
.../filter/policyrule/impl/ScriptedPolicyRule.java | 5 +++++
.../filter/policyrule/logic/impl/AndPolicyRule.java | 5 ++++-
.../filter/policyrule/logic/impl/NotPolicyRule.java | 8 +++++---
.../filter/policyrule/logic/impl/OrPolicyRule.java | 5 ++++-
.../saml/impl/AbstractEntityAttributePolicyRule.java | 6 +++++-
.../idp/attribute/filter/spring/BaseFilterParser.java | 17 ++++++++++++++---
.../filter/spring/basic/impl/AndMatcherParser.java | 5 ++++-
.../filter/spring/basic/impl/OrMatcherParser.java | 5 ++++-
.../spring/impl/AttributeFilterPolicyGroupParser.java | 4 +++-
.../spring/matcher/BaseAttributeValueMatcherParser.java | 8 ++++++--
.../filter/spring/matcher/impl/package-info.java | 7 +++++--
.../filter/spring/policyrule/BasePolicyRuleParser.java | 9 +++++++--
.../attribute/filter/spring/saml/impl/package-info.java | 7 +++++--
.../attribute/resolver/AbstractAttributeDefinition.java | 2 +-
.../idp/attribute/resolver/AbstractDataConnector.java | 2 +-
.../resolver/scripted/ScriptedIdPAttribute.java | 2 +-
.../idp/attribute/resolver/scripted/package-info.java | 4 +++-
.../resolver/ad/impl/ScriptedAttributeDefinition.java | 3 ++-
.../resolver/ad/impl/ScriptedIdPAttributeImpl.java | 15 ++++++++++++---
.../ad/mapped/impl/MappedAttributeDefinition.java | 5 ++++-
.../spring/ad/BaseAttributeDefinitionParser.java | 2 +-
.../impl/SubjectDerivedAttributeDefinitionParser.java | 7 +++++--
.../resolver/spring/dc/AbstractDataConnectorParser.java | 2 +-
.../spring/dc/impl/DataConnectorFactoryBean.java | 5 ++++-
.../spring/dc/impl/PairwiseIdDataConnectorParser.java | 2 +-
.../spring/dc/ldap/impl/LDAPDataConnectorParser.java | 6 +++++-
.../resolver/spring/impl/AttributeResolverParser.java | 4 +++-
.../DefaultPrincipalDeterminationStrategy.java | 2 +-
.../impl/InitializeProxyProfileRequestContext.java | 2 +-
.../idp/authn/spnego/impl/SPNEGOAuthnController.java | 6 ++++--
.../java/net/shibboleth/idp/installer/BuildWar.java | 7 +++++--
.../idp/installer/InstallerPropertiesImpl.java | 5 +++--
.../java/net/shibboleth/idp/installer/V4Install.java | 16 +++++++++++-----
.../shibboleth/idp/profile/AbstractProfileAction.java | 3 +--
.../net/shibboleth/idp/profile/impl/LogContextTree.java | 3 +--
.../idp/profile/impl/LogSpringContextInfo.java | 3 +--
.../idp/profile/impl/WebFlowMessageHandlerAdaptor.java | 2 +-
...gatingCriteriaRelyingPartyConfigurationResolver.java | 2 +-
.../metadata/AbstractMetadataProviderParser.java | 5 ++++-
.../metadata/impl/MetadataResolverServiceStrategy.java | 6 ++++--
.../credential/impl/AbstractBasicCredentialParser.java | 5 ++++-
.../credential/impl/AbstractX509CredentialParser.java | 5 ++++-
.../impl/PKIXInlineValidationInfoParser.java | 6 ++++--
.../impl/PKIXResourceValidationInfoParser.java | 6 ++++--
.../trustengine/impl/StaticPKIXSignatureParser.java | 9 +++++----
.../impl/StaticPKIXX509CredentialParser.java | 8 +++++---
.../shibboleth/idp/saml/metadata/ScopesContainer.java | 7 +++++--
.../AbstractCollectionConfigurationLookupStrategy.java | 2 +-
.../profile/config/ListConfigurationLookupStrategy.java | 2 +-
.../profile/config/SetConfigurationLookupStrategy.java | 2 +-
.../logic/DetailedErrorsProfileConfigPredicate.java | 2 +-
.../config/navigate/SessionLifetimeLookupFunction.java | 2 +-
.../config/navigate/ProxyCountLookupFunction.java | 3 ++-
.../metadata/impl/MetadataResolverServiceGaugeSet.java | 8 ++++++--
...hnStatementToAssertionFromInboundAssertionToken.java | 3 ++-
.../delegation/impl/AddDelegationPolicyToAssertion.java | 2 +-
.../delegation/impl/DecorateDelegatedAssertion.java | 2 +-
.../delegation/impl/EvaluateDelegationPolicy.java | 6 +++---
.../delegation/impl/PopulateDelegationContext.java | 2 +-
.../messaging/impl/LibertyHTTPSOAP11Encoder.java | 2 +-
.../idp/saml/saml2/profile/impl/AddAuthnRequest.java | 2 +-
.../saml2/profile/impl/ContinueSAMLAuthentication.java | 2 +-
.../saml2/profile/impl/ValidateSAMLAuthentication.java | 3 ++-
.../shibboleth/idp/session/impl/DestroySessions.java | 4 ++--
74 files changed, 243 insertions(+), 111 deletions(-)
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcher.java
index 3c1574f..eb1e8f9 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcher.java
@@ -36,10 +36,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This is the bases of all implementations of {@link Matcher} which do some sort of comparison.<br/>
- * <br/>
+ * This is the base of all implementations of {@link Matcher} which do some sort of comparison.
*/
-
public abstract class AbstractMatcher extends AbstractIdentifiableInitializableComponent implements Matcher {
/** Class logger. */
@@ -85,7 +83,7 @@ public abstract class AbstractMatcher extends AbstractIdentifiableInitializableC
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Attribute Filter '<filterID>' :"
+ * @return "Attribute Filter '<filterID>' :"
*/
protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronised clearing.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcher.java
index f9b8e9f..fd2de53 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcher.java
@@ -27,7 +27,10 @@ import org.slf4j.LoggerFactory;
/**
* Test that the scope in a {@link ScopedStringAttributeValue} is a regexp match to configured value.
- * <br/>If the value is not scoped return false (meaning that the value will not be included in the resulting set).
+ *
+ * <p>
+ * If the value is not scoped return false (meaning that the value will not be included in the resulting set).
+ * </p>
*/
public class AttributeScopeRegexpMatcher extends AbstractRegexpStringMatcher {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcher.java
index 5f5b4f5..625edca 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcher.java
@@ -27,8 +27,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Test that the scope of a {@link ScopedStringAttributeValue} is a string match to the value configured. <br/>
+ * Test that the scope of a {@link ScopedStringAttributeValue} is a string match to the value configured.
+ *
+ * <p>
* If the value is not scoped return false (meaning that the value will not be included in the resulting set).
+ * </p>
*/
public class AttributeScopeStringMatcher extends AbstractStringMatcher {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
index 5ea81b1..4206293 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
@@ -27,9 +27,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Test that an {@link IdPAttributeValue} is a regexp match to the configured string. <br/>
+ * Test that an {@link IdPAttributeValue} is a regexp match to the configured string.
+ *
+ * <p>
* If the value is not a {@link StringAttributeValue} string it is coerced into a string via the value's
* {@link java.lang.Object#toString()} method.
+ * </p>
*/
public class AttributeValueRegexpMatcher extends AbstractRegexpStringMatcher {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
index 8e556de..71df18d 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
@@ -28,9 +28,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Test that an {@link IdPAttributeValue} is a string match to the configured string.<br/>
+ * Test that an {@link IdPAttributeValue} is a string match to the configured string.
+ *
+ * <p>
* If the value is not a {@link StringAttributeValue} string it is coerced into a string via the value's
* {@link java.lang.Object#toString()} method.
+ * </p>
*/
public class AttributeValueStringMatcher extends AbstractStringMatcher {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
index c9ab418..e32aad9 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
@@ -179,15 +179,21 @@ public class ScriptedMatcher extends AbstractIdentifiableInitializableComponent
/**
* Perform the AttributeValueMatching.
+ *
* <p>
* When the script is evaluated, the following properties will be available via the {@link ScriptContext}:
+ * </p>
+ *
* <ul>
* <li><code>filterContext</code> - the current instance of {@link AttributeFilterContext}</li>
* <li><code>attribute</code> - the attribute whose values are to be evaluated
* </ul>
+ *
+ * <p>
* The script <strong>MUST</strong> return a {@link Set} containing the {@link IdPAttributeValue} objects that were
* matched.
* </p>
+ *
* {@inheritDoc}
*/
@Override @Nullable @NonnullElements @Unmodifiable public Set<IdPAttributeValue> getMatchingValues(
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
index 8081cd1..f900b80 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
@@ -39,10 +39,12 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import com.google.common.base.MoreObjects;
/**
- * {@link Matcher} that implements the negation of a matcher. <br/>
- * <br/>
+ * {@link Matcher} that implements the negation of a matcher.
+ *
+ * <p>
* A given attribute value is considered to have matched if it is not returned by the composed {@link Matcher}. The
* predicate is the logical NOT of the composed {@link Matcher}. If the matcher fails then failure is returned.
+ * </p>
*/
@ThreadSafe
public final class NotMatcher extends AbstractIdentifiableInitializableComponent implements Matcher {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
index b832240..dedef82 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
@@ -132,7 +132,7 @@ public abstract class AbstractMatchesShibMDScopeMatcher
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Attribute Filter '<filterID>' :"
+ * @return "Attribute Filter '<filterID>' :"
*/
protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronised clearing.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
index 0332e01..389b4ca 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
@@ -420,7 +420,7 @@ public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializabl
/**
* return a string which is to be prepended to all log messages.
*
- * @return "Attribute Filter '<filterID>' :"
+ * @return "Attribute Filter '<filterID>' :"
*/
@Nonnull protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronised clearing.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractPolicyRule.java
index 4fcb00d..8bd1184 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractPolicyRule.java
@@ -24,7 +24,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
/**
* Basis of all implementations of {@link PolicyRequirementRule} which do some sort of comparison.
*/
-
public abstract class AbstractPolicyRule extends AbstractIdentifiableInitializableComponent implements
PolicyRequirementRule {
@@ -43,7 +42,7 @@ public abstract class AbstractPolicyRule extends AbstractIdentifiableInitializab
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Attribute Filter '<filterID>' :"
+ * @return "Attribute Filter '<filterID>' :"
*/
protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronised clearing.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
index 654bd24..b7ff91c 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
@@ -160,11 +160,16 @@ public class ScriptedPolicyRule extends AbstractIdentifiableInitializableCompone
* Calculate the PolicyRule.
* <p>
* When the script is evaluated, the following property will be available via the {@link ScriptContext}:
+ * </p>
+ *
* <ul>
* <li><code>filterContext</code> - the current instance of {@link AttributeFilterContext}</li>
* </ul>
+ *
+ * <p>
* The script <strong>MUST</strong> return a {@link java.lang.Boolean}
* </p>
+ *
* {@inheritDoc}
*/
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRule.java
index a5f42df..eade539 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRule.java
@@ -34,8 +34,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* if every rule returns {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#TRUE},
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FAIL} as soon as a rule returns
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FAIL}, and
- * {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FALSE} otherwise.<br/>
+ * {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FALSE} otherwise.
+ *
+ * <p>
* The standard "fail/false fast" optimization is implemented.
+ * </p>
*/
@ThreadSafe
public class AndPolicyRule extends AbstractComposedPolicyRule {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRule.java
index 72ff36d..b8b7a46 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRule.java
@@ -31,9 +31,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import com.google.common.base.MoreObjects;
/**
- * {@link PolicyRequirementRule} that implements the negation of a matcher. <br/>
- * <br/>
- * if FAIL then FAIL else if TRUE then FALSE else TRUE<br/>
+ * {@link PolicyRequirementRule} that implements the negation of a matcher.
+ *
+ * <p>
+ * if FAIL then FAIL else if TRUE then FALSE else TRUE
+ * </p>
*/
@ThreadSafe
public final class NotPolicyRule extends AbstractIdentifiableInitializableComponent implements PolicyRequirementRule {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRule.java
index 802ecc9..5c2432b 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRule.java
@@ -34,8 +34,11 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* if any rule returns {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#TRUE},
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FAIL} as soon as a rule returns
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FAIL}, and
- * {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FALSE} otherwise.<br/>
+ * {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate#FALSE} otherwise.
+ *
+ * <p>
* The standard "fail/succeed fast" optimization is implemented.
+ * </p>
*/
@ThreadSafe
public class OrPolicyRule extends AbstractComposedPolicyRule {
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
index e42aa2e..84fc9ee 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
@@ -62,14 +62,18 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Multimap;
/**
- * Base class for matchers that check whether a particular entity attribute is present and contains a given value.<br/>
+ * Base class for matchers that check whether a particular entity attribute is present and contains a given value.
*
+ * <p>
* Given the metadata for an entity, this class takes care of navigation to the attribute and extracting the values,
* including optimized handling of mapped attributes.
+ * </p>
*
+ * <p>
* Classes wishing to implement Entity Attribute matchers implement {@link #getEntityMetadata(AttributeFilterContext)}
* to navigate to the entity (probably recipient or issuer) and {@link #entityAttributeValueMatches(Set)} to
* implement the comparison (probably string or regexp).
+ * </p>
*/
public abstract class AbstractEntityAttributePolicyRule extends AbstractPolicyRule {
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
index a8cd2a8..e4aa2f2 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
@@ -39,9 +39,12 @@ import org.w3c.dom.Element;
import com.google.common.base.Strings;
/**
- * Base class for Spring bean definition parsers within the filter engine configuration. <br>
+ * Base class for Spring bean definition parsers within the filter engine configuration.
+ *
+ * <p>
* This base class is responsible for generating an ID for the Spring bean that is unique within all the policy
* components loaded. This in turn underpins our implementation of referencing in the language.
+ * </p>
*/
public abstract class BaseFilterParser extends AbstractSingleBeanDefinitionParser {
@@ -124,10 +127,15 @@ public abstract class BaseFilterParser extends AbstractSingleBeanDefinitionParse
/**
* {@inheritDoc}
*
+ * <p>
* Calculate the qualified id once, and set both the id property as well as a qualified id metadata attribute used
- * by the {@link #resolveId(Element, AbstractBeanDefinition, ParserContext)} method.<br/>
+ * by the {@link #resolveId(Element, AbstractBeanDefinition, ParserContext)} method.
+ * </p>
+ *
+ * <p>
* If we auto-generate a name then we issue a warning so users can (1) correct this, but also so they can make sense
* of the logging in the filters which uses the id extensively.
+ * </p>
*/
@Override protected void doParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
@@ -166,9 +174,12 @@ public abstract class BaseFilterParser extends AbstractSingleBeanDefinitionParse
}
/**
- * Is this inside a <PolicyRequirementRule> or an permit or deny rule?. <br/>
+ * Is this inside a <PolicyRequirementRule> or an permit or deny rule?.
+ *
+ * <p>
* This is used when parsing the various rules (<MatchFunctorType>) since the bean we summon up depends on
* where we find ourselves.
+ * </p>
*
* @param element the element under question
* @return true if it is inside a policy requirement rule, false otherwise.
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AndMatcherParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AndMatcherParser.java
index 3a8956a..9e04aac 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AndMatcherParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AndMatcherParser.java
@@ -33,9 +33,12 @@ import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
- * Bean definition parser for {@link AndMatcher} or {@link AndPolicyRule} objects.<br/>
+ * Bean definition parser for {@link AndMatcher} or {@link AndPolicyRule} objects.
+ *
+ * <p>
* These both take as a constructor a list of {@link net.shibboleth.idp.attribute.filter.Matcher} or
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule} so the parsing code is common.
+ * </p>
*/
public class AndMatcherParser extends BaseFilterParser {
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/OrMatcherParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/OrMatcherParser.java
index 50de296..65f128c 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/OrMatcherParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/OrMatcherParser.java
@@ -33,9 +33,12 @@ import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
- * Bean definition parser for {@link OrMatcher} or {@link OrPolicyRule} objects.<br/>
+ * Bean definition parser for {@link OrMatcher} or {@link OrPolicyRule} objects.
+ *
+ * <p>
* These both take as a constructor a list of {@link net.shibboleth.idp.attribute.filter.Matcher} or
* {@link net.shibboleth.idp.attribute.filter.PolicyRequirementRule} so the parsing code is common.
+ * </p>
*/
public class OrMatcherParser extends BaseFilterParser {
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyGroupParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyGroupParser.java
index c19a7c9..91a8beb 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyGroupParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyGroupParser.java
@@ -35,12 +35,14 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
/**
- * Bean definition parser for <afp:AttributeFilterPolicyGroup>, top top level of the filter "stack". <br/>
+ * Bean definition parser for <afp:AttributeFilterPolicyGroup>, top top level of the filter "stack".
*
+ * <p>
* There is no bean being summoned up here. Rather we just parse all the children. Then over in the service all the *
* {@link net.shibboleth.idp.attribute.filter.AttributeFilterPolicy} beans are sucked out of spring by type and injected
* into a new {@link net.shibboleth.idp.attribute.filter.impl.AttributeFilterImpl} via a
* {@link AttributeFilterServiceStrategy}.
+ * </p>
*/
public class AttributeFilterPolicyGroupParser implements BeanDefinitionParser {
/** Schema type name. */
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
index 57db660..8f8ab9f 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
@@ -29,11 +29,15 @@ import net.shibboleth.idp.attribute.filter.PolicyFromMatcherId;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Base function for all Attribute Value matchers. <br/>
+ * Base function for all Attribute Value matchers.
*
+ * <p>
* This function takes care of the bean nesting needed to convert the bean (which is a natural matcher) into the correct
- * type. Specifically:<br/>
+ * type. Specifically:
+ * </p>
+ *
* <table>
+ * <caption>Bean Nesting</caption>
* <tr>
* <td>PolicyRule With Id</td>
* <td>Nest inside a {@link PolicyFromMatcherId}</td>
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/package-info.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/package-info.java
index 89530dc..a199448 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/package-info.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/package-info.java
@@ -17,8 +17,11 @@
/**
* Classes which parse beans which are natural "Matchers" (that is to say that they look at attribute values).
- * <br/> The bulk of the work is done in the base class
- * {@link net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser}.
+ *
+ * <p>
+ * The bulk of the work is done in the base class
+ * {@link net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser}.
+ * </p>
*/
package net.shibboleth.idp.attribute.filter.spring.matcher.impl;
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
index d959547..0b6d228 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
@@ -28,10 +28,15 @@ import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser;
/**
- * Base function for all natural policy rules. <br/>
+ * Base function for all natural policy rules.
+ *
+ * <p>
* This function takes care of the bean nesting needed to convert the bean (which is a natural policy rule) into the
- * correct type. Specifically:<br/>
+ * correct type. Specifically:
+ * </p>
+ *
* <table>
+ * <caption>Bean Nesting</caption>
* <tr>
* <td>PolicyRule</td>
* <td>Native</td>
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/package-info.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/package-info.java
index d210ad8..bc42a3e 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/package-info.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/package-info.java
@@ -17,8 +17,11 @@
/**
* Parsers for the top level of the "urn:mace:shibboleth:2.0:saml" namespace.
- * <br/> These are all "policy" type <MatchFunctorType> rules and so all
- * the parsers are based on {@link net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser}
+ *
+ * <p>
+ * These are all "policy" type <MatchFunctorType> rules and so all
+ * the parsers are based on {@link net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser}.
+ * </p>
*/
package net.shibboleth.idp.attribute.filter.spring.saml.impl;
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
index b44fddf..719899c 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
@@ -195,7 +195,7 @@ public abstract class AbstractAttributeDefinition extends AbstractResolverPlugin
/**
* return a string which is to be prepended to all log messages.
*
- * @return "Attribute Definition '<definitionID>' :"
+ * @return "Attribute Definition '<definitionID>' :"
*/
@Nonnull @NotEmpty protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronised clearing.
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
index b4553f9..0344a73 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
@@ -228,7 +228,7 @@ public abstract class AbstractDataConnector extends AbstractResolverPlugin<Map<S
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Data connector '<definitionID>' :"
+ * @return "Data connector '<definitionID>' :"
*/
@Nonnull @NotEmpty protected String getLogPrefix() {
// local cache of cached entry to allow unsynchronized clearing of per class cache.
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java
index e3510ef..47a4a73 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java
@@ -33,7 +33,7 @@ public interface ScriptedIdPAttribute {
/**
* Return all the values, but with {@link net.shibboleth.idp.attribute.StringAttributeValue} values returned as
- * strings.<br/>
+ * strings.
*
* @return a modifiable collection of the string attributes
* @throws ResolutionException if the script has called {@link #getNativeAttribute()}
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java
index 22d3d4a..c3739e8 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java
@@ -17,9 +17,11 @@
/**
* This Package contains interface definitions exported to ECMAScript.
- * <br/>
+ *
+ * <p>
* Interfaces defined in this package are not targeted at Java, and should not be
* used by Java.
+ * </p>
*/
package net.shibboleth.idp.attribute.resolver.scripted;
\ No newline at end of file
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
index a659daa..42a9e49 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
@@ -58,6 +58,7 @@ import edu.internet2.middleware.shibboleth.common.attribute.provider.V2SAMLProfi
*
* <p>
* The evaluated script has access to the following information:
+ * </p>
* <ul>
* <li>A script attribute whose name is the ID of this attribute definition and whose value is a newly constructed
* {@link IdPAttribute}.</li>
@@ -67,7 +68,7 @@ import edu.internet2.middleware.shibboleth.common.attribute.provider.V2SAMLProfi
* script attribute is the ID of the {@link IdPAttribute} and its value is the {@link List} of {@link IdPAttributeValue}
* for the attribute.</li>
* </ul>
- * </p>
+ *
* <p>
* The evaluated script should populate the values of the newly constructed {@link IdPAttribute} mentioned above. No
* other information from the script will be taken in to account.
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
index 35dfe35..75f28b5 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
@@ -40,9 +40,12 @@ import org.slf4j.LoggerFactory;
/**
* An encapsulated Attribute suitable for handing to scripts. This handles some of the cumbersome issues associated with
- * {@link IdPAttribute} and also a lot of the V2 backwards compatibility stuff. <br/>
+ * {@link IdPAttribute} and also a lot of the V2 backwards compatibility stuff.
+ *
+ * <p>
* NOTE, the java signature for this class may and will change on minor version changes. However the Scripting interface
* will remain the same (methods will never be removed).
+ * </p>
*/
public class ScriptedIdPAttributeImpl implements ScriptedIdPAttribute {
@@ -56,9 +59,12 @@ public class ScriptedIdPAttributeImpl implements ScriptedIdPAttribute {
private boolean calledGetNativeAttribute;
/**
- * All the {@link StringAttributeValue}, but as strings.<br/>
+ * All the {@link StringAttributeValue}, but as strings.
+ *
+ * <p>
* All other attributes as their native representation. If null then the {@link #getValues()} method has not been
* called.
+ * </p>
*/
private Collection<Object> attributeValues;
@@ -105,8 +111,11 @@ public class ScriptedIdPAttributeImpl implements ScriptedIdPAttribute {
}
/**
- * Return all the values, but with {@link StringAttributeValue} values returned as strings.<br/>
+ * Return all the values, but with {@link StringAttributeValue} values returned as strings.
+ *
+ * <p>
* This method is a helper method for V2 compatibility.
+ * </p>
*
* @return a modifiable collection of the string attributes (not the String
* @throws ResolutionException if the script has called {@link #getNativeAttribute()}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java
index 32b83a1..c094374 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java
@@ -50,11 +50,14 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
- * Implementation of Mapped Attributes. <br/>
+ * Implementation of Mapped Attributes.
+ *
+ * <p>
* An attribute definition that takes the values from previous resolution stages and converts them as it creates the
* output attribute. Each value is compared with a lookup table (a {@link java.util.Collection} of @link{ValueMap}s) and
* if it matches then the appropriate value(s) is/are substituted. Non matches are either passed through or are removed
* depending on the setting 'passThru'.
+ * </p>
* */
@ThreadSafe
public class MappedAttributeDefinition extends AbstractAttributeDefinition {
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
index e75993e..bf107ea 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
@@ -70,7 +70,7 @@ public abstract class BaseAttributeDefinitionParser extends BaseResolverPluginPa
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Attribute Definition '<definitionID>' :"
+ * @return "Attribute Definition '<definitionID>' :"
*/
@Override @Nonnull @NotEmpty protected String getLogPrefix() {
final StringBuilder builder = new StringBuilder("Attribute Definition '").append(getDefinitionId())
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
index 10bef82..82719f1 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
@@ -53,10 +53,13 @@ public class SubjectDerivedAttributeDefinitionParser extends BaseAttributeDefini
/**
* {@inheritDoc}.
*
- * We inject an inferred {@link SubjectDerivedAttributeValuesFunction}.<br/>
+ * We inject an inferred {@link SubjectDerivedAttributeValuesFunction}.
+ *
+ * <p>
* If 'principalAttributeName' we also inject an inferred {@link IdPAttributePrincipalValuesFunction} If
* 'attributeValueFunctionRef' the user has provided the function The
- * {@link ContextDerivedAttributeDefinitionParser} does the case when the user injects the top level function
+ * {@link ContextDerivedAttributeDefinitionParser} does the case when the user injects the top level function.
+ * </p>
*/
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
index 7e6ab92..c20b09d 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
@@ -218,7 +218,7 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Data Connector: '<definitionID>' :"
+ * @return "Data Connector: '<definitionID>' :"
*/
@Override @Nonnull @NotEmpty protected String getLogPrefix() {
final StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java
index 0ae466f..9d1795f 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java
@@ -252,9 +252,12 @@ public class DataConnectorFactoryBean extends AbstractResolverPluginFactoryBean<
}
/**
- * {@inheritDoc}. <br/>
+ * {@inheritDoc}
+ *
+ * <p>
* In order to create the bean we introspect with respect to contents of the Spring resources and inject as
* required.
+ * </p>
*/
@Override protected AbstractDataConnector doCreateInstance() throws Exception {
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
index d2bb323..c0185552 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
@@ -102,7 +102,7 @@ public class PairwiseIdDataConnectorParser extends BaseResolverPluginParser {
/**
* Return a string which is to be prepended to all log messages.
*
- * @return "Attribute Definition: '<definitionID>' :"
+ * @return "Attribute Definition: '<definitionID>' :"
*/
@Override @Nonnull @NotEmpty protected String getLogPrefix() {
final StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 9685640..ce483ff 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -93,8 +93,12 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
// CheckStyle: MethodLength|CyclomaticComplexity OFF
/**
- * Parses a version 2 configuration. <br/>
+ * Parses a version 2 configuration.
+ *
+ * <p>
* The following automatically created & injected beans acquire hard wired defaults:
+ * </p>
+ *
* <ul>
* <li>{@link SearchExecutor#setTimeLimit(Duration)} defaults to 3s, overridden by the "searchTimeLimit" attribute.
* </li>
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java
index 6e2536d..bf087ce 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java
@@ -35,13 +35,15 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorPars
import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
- * Bean definition parser for an {@link net.shibboleth.idp.attribute.resolver.AttributeResolver}. <br/>
+ * Bean definition parser for an {@link net.shibboleth.idp.attribute.resolver.AttributeResolver}.
*
+ * <p>
* There is no bean being summoned up here. Rather we just parse all the children. Then over in the service all the
* {@link net.shibboleth.idp.attribute.resolver.AttributeDefinition} and
* {@link net.shibboleth.idp.attribute.resolver.DataConnector} beans are sucked out of Spring
* by type and injected into a new {@link net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl} via a
* {@link net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy}.
+ * </p>
*/
public class AttributeResolverParser implements BeanDefinitionParser {
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java
index 4ecb5f1..9d72bc3 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/DefaultPrincipalDeterminationStrategy.java
@@ -39,7 +39,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
*
* <p>
* The context is located using a lookup strategy, by default a child of the input context.
- * <p>
+ * </p>
*
* <p>
* If for any reason a matching Principal can't be located, a default is returned.
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
index 3116719..0e19a9a 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/proxy/impl/InitializeProxyProfileRequestContext.java
@@ -69,7 +69,7 @@ public final class InitializeProxyProfileRequestContext extends AbstractProfileA
}
/**
- * Set the strategy to use to locate/create the {@link ProfileRequestContext to operate on.
+ * Set the strategy to use to locate/create the {@link ProfileRequestContext} to operate on.
*
* @param strategy lookup/creation strategy
*/
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
index f4f97f2..84e10a3 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
@@ -52,10 +52,12 @@ import org.springframework.web.servlet.ModelAndView;
/**
* MVC controller for managing the SPNEGO exchanges implemented as an {@link ExternalAuthentication} mechanism.
*
- * The handler methods either return contents back to the browser by returning an appropriate ResponseEntity<String>
- * object, or they return back to the flow by calling
+ * <p>
+ * The handler methods either return contents back to the browser by returning an appropriate
+ * ResponseEntity<String> object, or they return back to the flow by calling
* {@link ExternalAuthentication#finishExternalAuthentication(String, HttpServletRequest, HttpServletResponse)} and
* returning null. On unrecoverable errors, an exception is thrown.
+ * </p>
*/
@Controller
@RequestMapping(value="%{idp.authn.spnego.externalAuthnPath:/Authn/SPNEGO}")
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
index 8c4d037..20e57af 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
@@ -29,8 +29,11 @@ import net.shibboleth.idp.Version;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
-/** Code to build the war file during an install or on request.<p/>
- * This code<ul>
+/**
+ * Code to build the war file during an install or on request.
+ *
+ * <p>This code:</p>
+ * <ul>
* <li>Deletes any old detritus</li>
* <li>Creates a directory called webapp.tmp and populates it from the dist folder</li>
* <li>Overwrites this from edit-webapp</li>
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
index 4d98c60..b27dd16 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
@@ -361,8 +361,9 @@ public class InstallerPropertiesImpl extends AbstractInitializableComponent impl
return !addr.getHostAddress().equals(addr.getCanonicalHostName());
}
- /** Find the most aposite network connector. Taken from Ant.
- * @throws SocketException
+ /**
+ * Find the most apposite network connector. Taken from Ant.
+ *
* @return the best name we can work out
*/
// CheckStyle: CyclomaticComplexity OFF
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 8b89b84..5b45478 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -448,7 +448,9 @@ public class V4Install extends AbstractInitializableComponent {
generateSealer();
}
- /** Helper method for {@link #manageKeys()} to generate a crt and key file.
+ /**
+ * Helper method for {@link #execute()} to generate a crt and key file.
+ *
* @param fileBase the partial file name
* @return true iff the file pair was created
* @throws BuildException if badness occurrs.
@@ -491,8 +493,10 @@ public class V4Install extends AbstractInitializableComponent {
return true;
}
- /** Helper method for {@link #manageKeys()} to generate the backchannel keystore.
- * @throws BuildException if badness occurrs.
+ /**
+ * Helper method for {@link #execute()} to generate the backchannel keystore.
+ *
+ * @throws BuildException if badness occurs.
*/
private void generateKeyStore() {
final Path credentials = installerProps.getTargetDir().resolve("credentials");
@@ -531,8 +535,10 @@ public class V4Install extends AbstractInitializableComponent {
}
}
- /** Helper method for {@link #manageKeys()} to generate the Sealer.
- * @throws BuildException if badness occurrs.
+ /**
+ * Helper method for {@link #execute()} to generate the Sealer.
+ *
+ * @throws BuildException if badness occurs.
*/
private void generateSealer() {
final Path credentials = installerProps.getTargetDir().resolve("credentials");
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
index e0ef004..2a44ec3 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
@@ -49,14 +49,13 @@ import org.springframework.webflow.execution.RequestContext;
/**
* Base class for Spring-aware profile actions.
*
- * <p>This base class takes care of the following:
+ * <p>This base class takes care of the following:</p>
* <ul>
* <li>retrieving the {@link ProfileRequestContext} from the current request environment</li>
* <li>populating the SWF {@link RequestContext} into the profile context tree</li>
* <li>starting or stopping any timers as instructed by a
* {@link org.opensaml.profile.context.MetricContext} in the tree</li>
* </ul>
- * </p>
*
* <p>Action implementations may override {@link #doExecute(RequestContext, ProfileRequestContext)}
* if they require SWF functionality, but most should override {@link #doExecute(ProfileRequestContext)}
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogContextTree.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogContextTree.java
index 0f9ebb0..cabdec5 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogContextTree.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogContextTree.java
@@ -39,6 +39,7 @@ import org.springframework.webflow.execution.RequestContext;
* You can contextualize the logging of the context tree either by setting {@link #setDescription(String)},
* or more usefully by using an attribute on the specific action expression as below. This allows using
* just one declaration of the action bean, but parameterized differently depending on where it is placed.
+ * </p>
*
* <pre>
* {@code
@@ -47,8 +48,6 @@ import org.springframework.webflow.execution.RequestContext;
* </evaluate>
* }
* </pre>
- *
- * </p>
*/
//Checkstyle: JavadocStyle ON
public class LogContextTree extends AbstractProfileAction {
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogSpringContextInfo.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogSpringContextInfo.java
index 6670185..a28184a 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogSpringContextInfo.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/LogSpringContextInfo.java
@@ -40,6 +40,7 @@ import org.springframework.webflow.execution.RequestContext;
* You can contextualize the logging of the info either by setting {@link #setDescription(String)},
* or more usefully by using an attribute on the specific action expression as below. This allows using
* just one declaration of the action bean, but parameterized differently depending on where it is placed.
+ * </p>
*
* <pre>
* {@code
@@ -48,8 +49,6 @@ import org.springframework.webflow.execution.RequestContext;
* </evaluate>
* }
* </pre>
- *
- * </p>
*/
//Checkstyle: JavadocStyle ON
public class LogSpringContextInfo extends AbstractProfileAction implements ApplicationContextAware {
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java
index 799d55b..f47d549 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java
@@ -46,13 +46,13 @@ import org.slf4j.LoggerFactory;
* <p>
* The {@link Direction} enum is used to indicate the target message context for the invocation
* of the handler:
+ * </p>
* <ul>
* <li>{@link Direction#INBOUND} indicates to execute the handler on the
* {@link ProfileRequestContext#getInboundMessageContext()}</li>
* <li>{@link Direction#OUTBOUND} indicates to execute the handler on the
* {@link ProfileRequestContext#getOutboundMessageContext()}</li>
* </ul>
- * </p>
*
* @event {@link EventIds#PROCEED_EVENT_ID}
* @event {@link EventIds#INVALID_PROFILE_CTX}
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
index 261f274..f4b6631 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
@@ -55,12 +55,12 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
*
* <p>
* One of the following input criteria is required for resolution based on relying party entityID:
+ * </p>
* <ul>
* <li>{@link ProfileRequestContextCriterion}</li>
* <li>{@link EntityIdCriterion}</li>
* <li>{@link RoleDescriptorCriterion}</li>
* </ul>
- * </p>
*/
public class DelegatingCriteriaRelyingPartyConfigurationResolver extends AbstractIdentifiedInitializableComponent
implements CriteriaRelyingPartyConfigurationResolver, IdentifiableComponent {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
index 8801368..130dd0e 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
@@ -67,9 +67,12 @@ public abstract class AbstractMetadataProviderParser extends AbstractSingleBeanD
/**
* Handle attributes which are inappropriate for specific implementations. The chaining metadata provider cannot
- * have "requireValidMetadata" or "failFastInitialization" set, even though they are present in the schema. <br/>
+ * have "requireValidMetadata" or "failFastInitialization" set, even though they are present in the schema.
+ *
+ * <p>
* This method detects whether these elements are present and if the element is not a chaining provider returns
* true, otherwise it returns false and emits a warning.
+ * </p>
*
* @param element the element
* @param attribute the attribute
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java
index a9099f9..81d5121 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java
@@ -39,12 +39,14 @@ import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
- * Strategy for summoning up a {@link MetadataResolver} from a populated {@link ApplicationContext}. <br/>
+ * Strategy for summoning up a {@link MetadataResolver} from a populated {@link ApplicationContext}.
+ *
+ * <p>
* This is made somewhat complex by the need to chain multiple, top level Metadata Resolvers, but to not combine non
* top level resolvers. The parser will create a {@link MetadataProviderContainer} for each top level resolver. If we
* encounter but one we are done (it is a {@link ServiceableComponent} already), otherwise we need to chain all the
* children together and wrap them into a Serviceable Component.
- *
+ * </p>
*/
public class MetadataResolverServiceStrategy extends AbstractIdentifiableInitializableComponent implements
Function<ApplicationContext, ServiceableComponent<MetadataResolver>> {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractBasicCredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractBasicCredentialParser.java
index 5757724..a8d128a 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractBasicCredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractBasicCredentialParser.java
@@ -35,9 +35,12 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
/**
- * Specific parser for all BasicCredentials.<br/>
+ * Specific parser for all BasicCredentials.
+ *
+ * <p>
* This does the work of putting the element values into strings. The bean factory then does the correct thing - with
* some help from Spring doing auto-conversion.
+ * </p>
*/
public abstract class AbstractBasicCredentialParser extends AbstractCredentialParser {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractX509CredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractX509CredentialParser.java
index f5f52ac..57712a5 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractX509CredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractX509CredentialParser.java
@@ -37,9 +37,12 @@ import org.springframework.beans.factory.support.ManagedList;
import org.w3c.dom.Element;
/**
- * Specific parser for all X509Credentials.<br/>
+ * Specific parser for all X509Credentials.
+ *
+ * <p>
* This does the work of putting the element values into strings. The bean factory then does the correct thing - with
* some help from Spring doing auto-conversion.
+ * </p>
*/
public abstract class AbstractX509CredentialParser extends AbstractCredentialParser {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoParser.java
index ae07e37..c2eea48 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoParser.java
@@ -24,10 +24,12 @@ import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataP
import org.w3c.dom.Element;
/**
- * Parser for <ValidationInfo type="PKIXInline">.<br/>
+ * Parser for <ValidationInfo type="PKIXInline">.
*
+ * <p>
* All of the heavy lifting is done in the super class and the associated factory bean (which gets the parameters of
- * the type is wants by virtue of Springs type coercion.
+ * the type is wants by virtue of Springs type coercion).
+ * </p>
*/
public class PKIXInlineValidationInfoParser extends AbstractPKIXValidationInfoParser {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
index 2096ee9..8b0f746 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
@@ -24,10 +24,12 @@ import org.w3c.dom.Element;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
/**
- * Parser for <ValidationInfo type="PKIXFilesystem"> and <ValidationInfo type="PKIXResourceBacked">.<br/>
+ * Parser for <ValidationInfo type="PKIXFilesystem"> and <ValidationInfo type="PKIXResourceBacked">.
*
+ * <p>
* All of the heavy lifting is done in the super class and the associated factory bean (which gets the parameters of the
- * type is wants by virtue of Springs type coercion.
+ * type is wants by virtue of Springs type coercion).
+ * </p>
*/
public class PKIXResourceValidationInfoParser extends AbstractPKIXValidationInfoParser {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXSignatureParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXSignatureParser.java
index 77a6578..c44fb65 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXSignatureParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXSignatureParser.java
@@ -42,15 +42,16 @@ public class StaticPKIXSignatureParser extends AbstractStaticPKIXParser {
}
/**
- * {@inheritDoc} <br/>
- * We call into
+ * {@inheritDoc}
+ *
+ * <p>We call into
* {@link
* PKIXSignatureTrustEngine#PKIXSignatureTrustEngine(
* org.opensaml.security.x509.PKIXValidationInformationResolver,
* org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver,
* org.opensaml.security.x509.PKIXTrustEvaluator,
- * org.opensaml.security.x509.impl.X509CredentialNameEvaluator)}
- * .
+ * org.opensaml.security.x509.impl.X509CredentialNameEvaluator)}.
+ * </p>
*/
@Override protected void doParse(final Element element, final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXX509CredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXX509CredentialParser.java
index 0c3313e..6f3be31 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXX509CredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXX509CredentialParser.java
@@ -41,13 +41,15 @@ public class StaticPKIXX509CredentialParser extends AbstractStaticPKIXParser {
}
/**
- * {@inheritDoc} <br/>
+ * {@inheritDoc}
+ *
+ * <p>
* We call into
* {@link PKIXX509CredentialTrustEngine#PKIXX509CredentialTrustEngine(
* org.opensaml.security.x509.PKIXValidationInformationResolver,
* org.opensaml.security.x509.PKIXTrustEvaluator,
- * org.opensaml.security.x509.impl.X509CredentialNameEvaluator)}
- * .
+ * org.opensaml.security.x509.impl.X509CredentialNameEvaluator)}.
+ * </p>
*/
@Override protected void doParse(final Element element, final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
index bcaedae..b097f2f 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
@@ -80,8 +80,11 @@ public class ScopesContainer {
}
}
- /** Does the provided string match the scopes for this XMLObject?.
- * <br/> We test first against the non regexp scopes for the sake of performance.
+ /**
+ * Does the provided string match the scopes for this XMLObject?
+ *
+ * <p> We test first against the non regexp scopes for the sake of performance.</p>
+ *
* @param scope what to test.
* @return whether it matches any of the scopes.
*/
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
index f254c4d..d0b87a2 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractCollectionConfigurationLookupStrategy.java
@@ -41,7 +41,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * A strategy function that examines SAML metadata associated with a relying party and derives List<String>-valued
+ * A strategy function that examines SAML metadata associated with a relying party and derives List<String>-valued
* configuration settings based on EntityAttribute extension tags.
*
* @param <T1> type of collection member
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
index 37021e3..1a49f44 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
@@ -33,7 +33,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
/**
- * A strategy function that examines SAML metadata associated with a relying party and derives List<String>-valued
+ * A strategy function that examines SAML metadata associated with a relying party and derives List<String>-valued
* configuration settings based on EntityAttribute extension tags.
*
* @param <T> type of object in list
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
index 37647d9..ed840fe 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
@@ -34,7 +34,7 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
/**
- * A strategy function that examines SAML metadata associated with a relying party and derives Set<String>-valued
+ * A strategy function that examines SAML metadata associated with a relying party and derives Set<String>-valued
* configuration settings based on EntityAttribute extension tags.
*
* @param <T> type of object in list
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/DetailedErrorsProfileConfigPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/DetailedErrorsProfileConfigPredicate.java
index c654ac1..2be704f 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/DetailedErrorsProfileConfigPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/DetailedErrorsProfileConfigPredicate.java
@@ -26,7 +26,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
/**
* A predicate that evaluates
- * {@link net.shibboleth.idp.relyingparty.RelyingPartyConfiguration#isDetailedErrors(ProfileRequestContext)()}
+ * {@link net.shibboleth.idp.relyingparty.RelyingPartyConfiguration#isDetailedErrors(ProfileRequestContext)}
* if available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/SessionLifetimeLookupFunction.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/SessionLifetimeLookupFunction.java
index c0635cc..7bf4108 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/SessionLifetimeLookupFunction.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/SessionLifetimeLookupFunction.java
@@ -29,7 +29,7 @@ import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfigurati
import org.opensaml.profile.context.ProfileRequestContext;
/**
- * A function that returns {@link BrowserSSOProfileConfiguration#getMaximumSPSessionLifetime(ProfileRequestContext))}
+ * A function that returns {@link BrowserSSOProfileConfiguration#getMaximumSPSessionLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
index c2d1155..59b9b1f 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/navigate/ProxyCountLookupFunction.java
@@ -28,7 +28,8 @@ import org.opensaml.profile.context.ProfileRequestContext;
/**
* A function that returns the allowable proxy count based on the result of
- * {@link SAML2ProfileConfiguration#getProxyCount()}, if such a profile is available
+ * {@link SAML2ProfileConfiguration#getProxyCount(ProfileRequestContext)},
+ * if such a profile is available
* from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index 29d48df..36af78f 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -138,10 +138,14 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet<M
}
// Checkstyle: MethodLength ON
- /** Helper Function for map construction.<br/>
+ /**
+ * Helper Function for map construction.
*
+ * <p>
* This does all the service handling and just calls the specific {@link BiConsumer} to
- * add each appropriate the value to the map.
+ * add each appropriate the value to the map.
+ * </p>
+ *
* @param consume the thing which does checking and adding the building
* @return an appropriate map
*/
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java
index 39f346a..bd45fbf 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java
@@ -58,7 +58,8 @@ import org.slf4j.LoggerFactory;
* be used or created</p>
*
* <p>A constructed {@link Assertion} will have its ID, IssueInstant, Issuer, and Version properties set.
- * The issuer is based on {@link net.shibboleth.idp.relyingparty.RelyingPartyConfiguration#getResponderId()}.</p>
+ * The issuer is based on
+ * {@link net.shibboleth.idp.relyingparty.RelyingPartyConfiguration#getResponderId(ProfileRequestContext)}.</p>
*
* @event {@link EventIds#INVALID_MSG_CTX}
* @event {@link EventIds#INVALID_PROFILE_CTX}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java
index 5cd6031..6c07c31 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java
@@ -50,6 +50,7 @@ import org.slf4j.LoggerFactory;
*
* <p>
* The maximum chain delegation length value for the added policy element is as follows:
+ * </p>
* <ol>
* <li>If an inbound assertion token is present as determined by the strategy set by
* {@link #setAssertionTokenStrategy(Function)}, the value is obtained from the policy contained
@@ -60,7 +61,6 @@ import org.slf4j.LoggerFactory;
* <li>If neither of these approaches produces a value, a default value is used
* {@link #DEFAULT_POLICY_MAX_CHAIN_LENGTH}</li>
* </ol>
- * </p>
*/
@Prototype
public class AddDelegationPolicyToAssertion extends AbstractProfileAction {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
index 988631e..b8a5287 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
@@ -89,6 +89,7 @@ import org.slf4j.LoggerFactory;
*
* <p>
* The decoration consists of 3 primary parts:
+ * </p>
* <ol>
* <li>
* A holder-of-key {@link SubjectConfirmation} is added to the assertion's {@link Subject}. The credentials used
@@ -109,7 +110,6 @@ import org.slf4j.LoggerFactory;
* {@link #setLibertySSOSEndpointURLLookupStrategy(Function)}.
* </li>
* </ol>
- * </p>
*
* @event {@link EventIds#INVALID_PROFILE_CTX}
*/
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicy.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicy.java
index d4c33c9..7b01b33 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicy.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicy.java
@@ -51,10 +51,11 @@ import org.slf4j.LoggerFactory;
*
* <p>
* Two policy checks are performed:
+ * </p>
* <ol>
* <li>
- * The active {@link SSOSProfileConfiguration} is resolved and the predicate
- * {@link SSOSProfileConfiguration#getDelegationPredicate()} is applied. If the predicate evaluates to false,
+ * The active {@link SSOSProfileConfiguration} is resolved and its predicate
+ * is applied. If the predicate evaluates to false,
* the request is not allowed. An example predicate commonly used here is
* {@link net.shibboleth.idp.saml.profile.config.logic.AllowedSAMLPresentersPredicate}.
* </li>
@@ -69,7 +70,6 @@ import org.slf4j.LoggerFactory;
* inbound assertion token's {@link Advice}.
* </li>
* </ol>
- * </p>
*
* @event {@link AuthnEventIds#NO_CREDENTIALS}
* @event {@link EventIds#INVALID_PROFILE_CTX}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
index 3949fb1..a71900f 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java
@@ -66,6 +66,7 @@ import org.slf4j.LoggerFactory;
*
* <p>
* The output of 3 different evaluations is combined to produce the final result:
+ * </p>
* <ol>
*
* <li>
@@ -91,7 +92,6 @@ import org.slf4j.LoggerFactory;
* </li>
*
* </ol>
- * </p>
*
* <p>
* If 1) delegation is allowed, 2) subject confirmation credentials were resolved, and 3) request status was either
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
index fe2a15d..a5dce62 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11Encoder.java
@@ -165,6 +165,7 @@ public class LibertyHTTPSOAP11Encoder extends BaseHttpServletResponseXMLMessageE
/**
* <p>
* This implementation performs the following actions on the context's {@link HttpServletResponse}:
+ * </p>
* <ol>
* <li>Adds the HTTP header: "Cache-control: no-cache, no-store"</li>
* <li>Adds the HTTP header: "Pragma: no-cache"</li>
@@ -173,7 +174,6 @@ public class LibertyHTTPSOAP11Encoder extends BaseHttpServletResponseXMLMessageE
* <li>Sets the SOAPAction HTTP header the value returned by {@link #getSOAPAction()}, if
* that returns non-null.</li>
* </ol>
- * </p>
*
* <p>
* Subclasses should NOT set the SOAPAction HTTP header in this method. Instead, they should override
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
index defb511..9fc7eb9 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequest.java
@@ -340,7 +340,7 @@ public class AddAuthnRequest extends AbstractAuthenticationAction {
}
/**
- * Build a {@Scoping} element, decrementing the proxy count if set.
+ * Build a {@link Scoping} element, decrementing the proxy count if set.
*
* @param profileRequestContext current profile request context
* @param count proxy count
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ContinueSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ContinueSAMLAuthentication.java
index d8ec4c0..3970bfd 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ContinueSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ContinueSAMLAuthentication.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* back into the flow and pick up any signaled errors if necessary.</p>
*
* @event {@link EventIds#PROCEED_EVENT_ID}
- * @event {@Link EventIds#MESSAGE_PROC_ERROR}
+ * @event {@link EventIds#MESSAGE_PROC_ERROR}
* @event {@link AuthnEventIds#INVALID_AUTHN_CTX}
* @event {@link AuthnEventIds#NO_CREDENTIALS}
* @event various
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
index 390d1ac..1e0f13c 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ValidateSAMLAuthentication.java
@@ -184,7 +184,8 @@ public class ValidateSAMLAuthentication extends AbstractValidationAction {
/**
* Sets the strategy function to invoke for generalized extraction of data into
- * {@link IdPAttribute} objects for inclusion in the {@link AuthenticationResult}.
+ * {@link IdPAttribute} objects for inclusion in the
+ * {@link net.shibboleth.idp.authn.AuthenticationResult}.
*
* @param strategy extraction strategy
*/
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
index 3de9f12..b08eef9 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
@@ -51,8 +51,8 @@ import com.google.common.base.Predicates;
* @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
* @event {@link org.opensaml.profile.action.EventIds#IO_ERROR}
* @post The sessions are removed from the session manager.
- * @post The sessions are removed from the {@LogoutContext}.
- * @post The {@SessionContext} is removed if it matched one of the sessions destroyed.
+ * @post The sessions are removed from the {@link LogoutContext}.
+ * @post The {@link SessionContext} is removed if it matched one of the sessions destroyed.
*
* @since 4.0.0
*/
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list